Attachment 145371 Details for Bug 222324 – patch

patch

gdk-pixbuf-0.22.0-multilib.patch (text/x-patch), 1.97 KB, created by Matthias Clasen on 2007-01-11 17:48:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2007-01-11 17:48:09 UTC

Size: 1.97 KB

patch

obsolete

>--- gdk-pixbuf-0.22.0/Makefile.am.multilib	2000-08-27 19:06:54.000000000 -0400
>+++ gdk-pixbuf-0.22.0/Makefile.am	2007-01-11 11:15:25.000000000 -0500
>@@ -46,3 +46,6 @@
> 	     -e 's?\@GNOMECANVASPIXBUF_LIBS\@?$(GNOMECANVASPIXBUF_LIBS)?g' \
> 	        < $(srcdir)/gnomecanvaspixbufConf.sh.in > gnomecanvaspixbufConf.tmp \
> 	&& mv gnomecanvaspixbufConf.tmp gnomecanvaspixbufConf.sh
>+
>+pkgconfigdir = $(libdir)/pkgconfig
>+pkgconfig_DATA= gdk-pixbuf.pc
>--- gdk-pixbuf-0.22.0/gdk-pixbuf-config.in.multilib	2001-10-09 16:49:55.000000000 -0400
>+++ gdk-pixbuf-0.22.0/gdk-pixbuf-config.in	2007-01-11 11:15:25.000000000 -0500
>@@ -1,7 +1,8 @@
> #!/bin/sh
> 
>-prefix=@prefix@
>-exec_prefix=@exec_prefix@
>+[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
>+prefix=`${PKG_CONFIG} --variable prefix gdk-pixbuf`
>+exec_prefix=`${PKG_CONFIG} --variable exec_prefix gdk-pixbuf`
> exec_prefix_set=no
> 
> usage="\
>@@ -39,12 +40,10 @@
>       echo @GDK_PIXBUF_VERSION@
>       ;;
>     --cflags)
>-      includes=-I@includedir@/gdk-pixbuf-1.0
>-      echo $includes `gtk-config --cflags`
>+      ${PKG_CONFIG} --cflags gdk-pixbuf
>       ;;
>     --libs)
>-      libdirs=-L@libdir@
>-      echo $libdirs -lgdk_pixbuf `gtk-config --libs`
>+      ${PKG_CONFIG} --libs gdk-pixbuf
>       ;;
>     *)
>       echo "${usage}" 1>&2
>--- gdk-pixbuf-0.22.0/gdk-pixbuf.pc.in.multilib	2007-01-11 11:17:40.000000000 -0500
>+++ gdk-pixbuf-0.22.0/gdk-pixbuf.pc.in	2007-01-11 11:17:34.000000000 -0500
>@@ -0,0 +1,12 @@
>+prefix=@prefix@
>+exec_prefix=@exec_prefix@
>+libdir=@libdir@
>+includedir=@includedir@
>+
>+Name: GdkPixbuf
>+Description: Image loading and scaling
>+Version: @VERSION@
>+Requires: gtk+ gmodule
>+Libs: -L${libdir} -lgdk_pixbuf
>+Cflags: -I${includedir}/gdk-pixbuf-1.0
>+
>--- gdk-pixbuf-0.22.0/configure.in.multilib	2007-01-11 11:15:25.000000000 -0500
>+++ gdk-pixbuf-0.22.0/configure.in	2007-01-11 11:15:25.000000000 -0500
>@@ -372,6 +372,7 @@
> gdk-pixbuf/gdk-pixbuf-features.h
> gdk-pixbuf/pixops/Makefile
> gdk-pixbuf-config
>+gdk-pixbuf.pc
> demo/Makefile
> doc/Makefile
> ])

Actions: View

Attachments on bug 222324: 145371