Looks like the recent changes to (at least) the pango and gtk2 multilib
patches were diffed backwards.
The hunk at the end of the pango patch is trying to delete -BUILDENV
from pango/Makefile.in, not add it. (The ".in.orig" and ".in" filenames
look like they're in the correct order, but the change being applied is
backwards. Maybe the original was ".in", and the patched version
somehow got named ".in.orig"?) It also doesn't have a "diff" command
line in the header (for only that hunk), just the +++ and --- headers;
although patch seems to be OK with that.
For gtk2, the directories are clearly backwards (i.e. diffed in the
wrong direction): the entire patch is reversed, and it's trying to
remove -BUILDENV from everywhere instead of add it. "patch -r" does the
right thing, but the patch file should really be flipped around.
(Not sure if this is the right list or not, but it should catch a few
devs' eyes at least.)
I've attached manually-fixed-up versions of both patches. I also fixed
a few offsets I was seeing in the pango patch (older versions), fixed
the directory names, and added a "diff" line for the last hunk. (Most
of this is just cosmetic. It applies with no fuzz or offsets now,
though.)
Submitted By: Joe Ciccone
Date: 2007-05-29
Initial Package Version: 2.10.3
Upstream Status: None
Origin: Joe Ciccone
Description: Fixes multilib configuration issues where the config file has
the path of libs in it. Usage:
sed -i "s/BUILDENV/32/" gdk-pixbuf/gdk-pixbuf-io.c \
gdk-pixbuf/Makefile.am \
gdk-pixbuf/Makefile.in \
gtk/gtkrc.c \
modules/input/Makefile.am \
modules/input/Makefile.in
Rediffed against 2.14.2 By Joe Ciccone on 2008-09-20
Rediffed against 2.16.6 By Joe Ciccone on 2009-09-07
Rediffed against 2.18.0 By Jim Gifford on 2009-09-22
diff -Naur gtk+-2.18.0.orig/gdk-pixbuf/gdk-pixbuf-io.c
gtk+-2.18.0/gdk-pixbuf/gdk-pixbuf-io.c
--- gtk+-2.18.0.orig/gdk-pixbuf/gdk-pixbuf-io.c 2009-09-11 19:58:36.000000000
-0700
+++ gtk+-2.18.0/gdk-pixbuf/gdk-pixbuf-io.c 2009-09-24 07:43:27.000000000
-0700
@@ -305,7 +305,7 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
"gdk-pixbuf.loaders", NULL);
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0-BUILDENV",
"gdk-pixbuf.loaders", NULL);
return result;
}
diff -Naur gtk+-2.18.0.orig/gdk-pixbuf/Makefile.am
gtk+-2.18.0/gdk-pixbuf/Makefile.am
--- gtk+-2.18.0.orig/gdk-pixbuf/Makefile.am 2009-09-11 19:58:36.000000000
-0700
+++ gtk+-2.18.0/gdk-pixbuf/Makefile.am 2009-09-24 07:43:27.000000000 -0700
@@ -684,8 +684,8 @@
# after the libraries are installed in their final locations.
install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV ; \
+ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders >
$(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gdk-pixbuf.loaders ; \
else \
echo "***" ; \
echo "*** Warning: gdk-pixbuf.loaders not built" ; \
@@ -696,7 +696,7 @@
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gdk-pixbuf.loaders
if CROSS_COMPILING
else
diff -Naur gtk+-2.18.0.orig/gdk-pixbuf/Makefile.in
gtk+-2.18.0/gdk-pixbuf/Makefile.in
--- gtk+-2.18.0.orig/gdk-pixbuf/Makefile.in 2009-09-22 19:22:48.000000000
-0700
+++ gtk+-2.18.0/gdk-pixbuf/Makefile.in 2009-09-24 07:43:27.000000000 -0700
@@ -2329,8 +2329,8 @@
# after the libraries are installed in their final locations.
install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV ; \
+ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders >
$(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gdk-pixbuf.loaders ; \
else \
echo "***" ; \
echo "*** Warning: gdk-pixbuf.loaders not built" ; \
@@ -2341,7 +2341,7 @@
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gdk-pixbuf.loaders
@cross_compiling_fa...@all-local: gdk-pixbuf.loaders
diff -Naur gtk+-2.18.0.orig/gtk/gtkrc.c gtk+-2.18.0/gtk/gtkrc.c
--- gtk+-2.18.0.orig/gtk/gtkrc.c 2009-06-04 12:18:04.000000000 -0700
+++ gtk+-2.18.0/gtk/gtkrc.c 2009-09-24 07:43:27.000000000 -0700
@@ -450,7 +450,7 @@
if (im_module_file)
result = g_strdup (im_module_file);
else
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules",
NULL);
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0-BUILDENV",
"gtk.immodules", NULL);
}
return result;
diff -Naur gtk+-2.18.0.orig/modules/input/Makefile.am
gtk+-2.18.0/modules/input/Makefile.am
--- gtk+-2.18.0.orig/modules/input/Makefile.am 2009-09-11 19:58:39.000000000
-0700
+++ gtk+-2.18.0/modules/input/Makefile.am 2009-09-24 07:43:27.000000000
-0700
@@ -189,10 +189,10 @@
# after the libraries are installed in their final locations.
install-data-hook:
@if $(RUN_QUERY_IMMODULES_TEST) ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
- $(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
+ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV ; \
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV ; \
+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gtk.immodules" ; \
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gtk.immodules ; \
else \
echo "***" ; \
echo "*** Warning: gtk.immodules not built" ; \
@@ -203,7 +203,7 @@
fi
uninstall-local:
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gtk.immodules
if BUILD_DYNAMIC_MODULES
diff -Naur gtk+-2.18.0.orig/modules/input/Makefile.in
gtk+-2.18.0/modules/input/Makefile.in
--- gtk+-2.18.0.orig/modules/input/Makefile.in 2009-09-22 19:22:51.000000000
-0700
+++ gtk+-2.18.0/modules/input/Makefile.in 2009-09-24 07:43:27.000000000
-0700
@@ -1235,10 +1235,10 @@
# after the libraries are installed in their final locations.
install-data-hook:
@if $(RUN_QUERY_IMMODULES_TEST) ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
- $(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
+ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV ; \
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV ; \
+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gtk.immodules" ; \
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gtk.immodules ; \
else \
echo "***" ; \
echo "*** Warning: gtk.immodules not built" ; \
@@ -1249,7 +1249,7 @@
fi
uninstall-local:
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0-BUILDENV/gtk.immodules
included-modules: $(noinst_LTLIBRARIES)
Submitted By: Joe Ciccone <[email protected]>
Date: 2006-08-19
Initial Package Version: 1.12.3
Rediffed against 1.14.4 on 2006-09-16
Rediffed against 1.20.5 on 2008-09-20
Rediffed against 1.22.0 on 2008-10-10
Rediffed against 1.24.5 on 2009-09-10
Upstream Status: None
Origin: Joe Ciccone
Description: Fixes multilib configuration issues with pango, where the modules
(shared libraries) are stored in /etc/pango/pango.modules. This
patch makes it /etc/pango-BUILDENV/pango.modules. Run the following
sed after applying this patch.
sed -i "s/BUILDENV/32/" pango/pango-utils.c \
modules/Makefile.am \
modules/Makefile.in \
pango/Makefile.am \
pango/Makefile.in
diff -Naur pango-1.26.0.orig/modules/Makefile.am
pango-1.26.0/modules/Makefile.am
--- pango-1.26.0.orig/modules/Makefile.am 2009-05-21 09:10:01.000000000
-0400
+++ pango-1.26.0/modules/Makefile.am 2009-09-07 04:52:53.709373498 -0400
@@ -28,15 +28,15 @@
install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
+ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-BUILDENV \&\&
\
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
+ \> $(DESTDIR)$(sysconfdir)/pango-BUILDENV/pango.modules ;
\
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-BUILDENV &&
\
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
+ > $(DESTDIR)$(sysconfdir)/pango-BUILDENV/pango.modules ;
\
else \
echo "***" ; \
- echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
+ echo "*** Warning: $(sysconfdir)/pango-BUILDENV/pango.modules" ;
\
echo "*** not created" ; \
echo "*** Generate this file on the target system" ; \
echo "*** using pango-querymodules" ; \
@@ -44,7 +44,7 @@
fi
uninstall-local:
- $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
+ $(RM) $(DESTDIR)$(sysconfdir)/pango-BUILDENV/pango.modules
pango.modules: \
$(SUBDIRS) \
diff -Naur pango-1.26.0.orig/modules/Makefile.in
pango-1.26.0/modules/Makefile.in
--- pango-1.26.0.orig/modules/Makefile.in 2009-07-20 16:59:47.000000000
-0400
+++ pango-1.26.0/modules/Makefile.in 2009-09-07 04:52:53.710406639 -0400
@@ -642,15 +642,15 @@
install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
+ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-BUILDENV \&\&
\
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
+ \> $(DESTDIR)$(sysconfdir)/pango-BUILDENV/pango.modules ;
\
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-BUILDENV &&
\
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
+ > $(DESTDIR)$(sysconfdir)/pango-BUILDENV/pango.modules ;
\
else \
echo "***" ; \
- echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
+ echo "*** Warning: $(sysconfdir)/pango-BUILDENV/pango.modules" ;
\
echo "*** not created" ; \
echo "*** Generate this file on the target system" ; \
echo "*** using pango-querymodules" ; \
@@ -658,7 +658,7 @@
fi
uninstall-local:
- $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
+ $(RM) $(DESTDIR)$(sysconfdir)/pango-BUILDENV/pango.modules
pango.modules: \
$(SUBDIRS) \
diff -Naur pango-1.26.0.orig/pango/Makefile.am pango-1.26.0/pango/Makefile.am
--- pango-1.26.0.orig/pango/Makefile.am 2009-07-20 16:59:27.000000000 -0400
+++ pango-1.26.0/pango/Makefile.am 2009-09-07 04:52:53.710406639 -0400
@@ -185,7 +185,7 @@
if HAVE_X
pangoinclude_HEADERS += $(pangox_headers)
lib_LTLIBRARIES += libpangox-1.0.la
-aliasdir = $(sysconfdir)/pango
+aliasdir = $(sysconfdir)/pango-BUILDENV
alias_DATA = pangox.aliases
endif
diff -Naur pango-1.26.0.orig/pango/pango-utils.c
pango-1.26.0/pango/pango-utils.c
--- pango-1.26.0.orig/pango/pango-utils.c 2009-02-06 18:49:34.000000000
-0500
+++ pango-1.26.0/pango/pango-utils.c 2009-09-07 04:52:53.724934507 -0400
@@ -703,7 +703,7 @@
}
return result;
#else
- return SYSCONFDIR "/pango";
+ return SYSCONFDIR "/pango-BUILDENV";
#endif
}
diff -Naur pango-1.26.0.orig/pango/Makefile.in pango-1.26.0/pango/Makefile.in
--- pango-1.26.0.orig/pango/Makefile.in 2009-09-25 17:26:59.000000000 +0200
+++ pango-1.26.0/pango/Makefile.in 2009-09-21 22:15:26.000000000 +0200
@@ -612,7 +612,7 @@
pango-enum-types.h $(am__append_3) $(am__append_7) \
$(am__append_12) $(am__append_17) $(am__append_29) \
$(am__append_32)
-...@have_x_true@aliasdir = $(sysconfdir)/pango
+...@have_x_true@aliasdir = $(sysconfdir)/pango-BUILDENV
@have_x_t...@alias_data = pangox.aliases
pangox_headers = pangox.h
pangox_public_sources = pangox.c
_______________________________________________
Clfs-dev mailing list
[email protected]
http://lists.cross-lfs.org/listinfo.cgi/clfs-dev-cross-lfs.org
