From 71b169446ef4c96b98719ce1f5ad1e716c7ba295 Mon Sep 17 00:00:00 2001 From: Thomas Penteker Date: Thu, 8 Oct 2009 19:04:00 +0200 Subject: [PATCH] babl: fix GNU autohell --- babl/.footprint | 63 ++++++++++++++++++--------------------- babl/.md5sum | 1 + babl/Pkgfile | 6 +++- babl/unscrew-destdir.diff | 58 +++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 35 deletions(-) create mode 100644 babl/unscrew-destdir.diff diff --git a/babl/.footprint b/babl/.footprint index d1dad6d75..3f00909a4 100644 --- a/babl/.footprint +++ b/babl/.footprint @@ -1,37 +1,3 @@ -drwxr-xr-x root/root tmp/ -drwxr-xr-x root/root tmp/babl-work/ -drwxr-xr-x root/root tmp/babl-work/pkg/ -drwxr-xr-x root/root tmp/babl-work/pkg/usr/ -drwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/ -drwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/ --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/CIE-Lab.la -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/CIE-Lab.so -> CIE-Lab.so.0.0.0 -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/CIE-Lab.so.0 -> CIE-Lab.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/CIE-Lab.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gegl-fixups.la -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gegl-fixups.so -> gegl-fixups.so.0.0.0 -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gegl-fixups.so.0 -> gegl-fixups.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gegl-fixups.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gggl-lies.la -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gggl-lies.so -> gggl-lies.so.0.0.0 -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gggl-lies.so.0 -> gggl-lies.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gggl-lies.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gggl.la -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gggl.so -> gggl.so.0.0.0 -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gggl.so.0 -> gggl.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gggl.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gimp-8bit.la -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gimp-8bit.so -> gimp-8bit.so.0.0.0 -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gimp-8bit.so.0 -> gimp-8bit.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/gimp-8bit.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/naive-CMYK.la -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/naive-CMYK.so -> naive-CMYK.so.0.0.0 -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/naive-CMYK.so.0 -> naive-CMYK.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/naive-CMYK.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/sse-fixups.la -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/sse-fixups.so -> sse-fixups.so.0.0.0 -lrwxrwxrwx root/root tmp/babl-work/pkg/usr/lib/babl-0.0/sse-fixups.so.0 -> sse-fixups.so.0.0.0 --rwxr-xr-x root/root tmp/babl-work/pkg/usr/lib/babl-0.0/sse-fixups.so.0.0.0 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/babl-0.0/ @@ -41,6 +7,35 @@ drwxr-xr-x root/root usr/include/babl-0.0/babl/ -rw-r--r-- root/root usr/include/babl-0.0/babl/babl-version.h -rw-r--r-- root/root usr/include/babl-0.0/babl/babl.h drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/babl-0.0/ +-rwxr-xr-x root/root usr/lib/babl-0.0/CIE-Lab.la +lrwxrwxrwx root/root usr/lib/babl-0.0/CIE-Lab.so -> CIE-Lab.so.0.0.0 +lrwxrwxrwx root/root usr/lib/babl-0.0/CIE-Lab.so.0 -> CIE-Lab.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/CIE-Lab.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/gegl-fixups.la +lrwxrwxrwx root/root usr/lib/babl-0.0/gegl-fixups.so -> gegl-fixups.so.0.0.0 +lrwxrwxrwx root/root usr/lib/babl-0.0/gegl-fixups.so.0 -> gegl-fixups.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/gegl-fixups.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/gggl-lies.la +lrwxrwxrwx root/root usr/lib/babl-0.0/gggl-lies.so -> gggl-lies.so.0.0.0 +lrwxrwxrwx root/root usr/lib/babl-0.0/gggl-lies.so.0 -> gggl-lies.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/gggl-lies.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/gggl.la +lrwxrwxrwx root/root usr/lib/babl-0.0/gggl.so -> gggl.so.0.0.0 +lrwxrwxrwx root/root usr/lib/babl-0.0/gggl.so.0 -> gggl.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/gggl.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/gimp-8bit.la +lrwxrwxrwx root/root usr/lib/babl-0.0/gimp-8bit.so -> gimp-8bit.so.0.0.0 +lrwxrwxrwx root/root usr/lib/babl-0.0/gimp-8bit.so.0 -> gimp-8bit.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/gimp-8bit.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/naive-CMYK.la +lrwxrwxrwx root/root usr/lib/babl-0.0/naive-CMYK.so -> naive-CMYK.so.0.0.0 +lrwxrwxrwx root/root usr/lib/babl-0.0/naive-CMYK.so.0 -> naive-CMYK.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/naive-CMYK.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/sse-fixups.la +lrwxrwxrwx root/root usr/lib/babl-0.0/sse-fixups.so -> sse-fixups.so.0.0.0 +lrwxrwxrwx root/root usr/lib/babl-0.0/sse-fixups.so.0 -> sse-fixups.so.0.0.0 +-rwxr-xr-x root/root usr/lib/babl-0.0/sse-fixups.so.0.0.0 -rwxr-xr-x root/root usr/lib/libbabl-0.0.la lrwxrwxrwx root/root usr/lib/libbabl-0.0.so -> libbabl-0.0.so.0.100.0 lrwxrwxrwx root/root usr/lib/libbabl-0.0.so.0 -> libbabl-0.0.so.0.100.0 diff --git a/babl/.md5sum b/babl/.md5sum index 04cae1fc6..b34633052 100644 --- a/babl/.md5sum +++ b/babl/.md5sum @@ -1 +1,2 @@ 197133d84fe120ee66c8137dff1696e6 babl-0.1.0.tar.bz2 +f76c0280d3df2eba5b14406abc796eae unscrew-destdir.diff diff --git a/babl/Pkgfile b/babl/Pkgfile index 09dc7135e..d98ccbe0b 100644 --- a/babl/Pkgfile +++ b/babl/Pkgfile @@ -7,10 +7,14 @@ name=babl version=0.1.0 release=1 -source=(ftp://ftp.gtk.org/pub/babl/0.1/$name-$version.tar.bz2) +source=(ftp://ftp.gtk.org/pub/babl/0.1/$name-$version.tar.bz2 \ + unscrew-destdir.diff) build() { cd $name-$version + + patch -i ../unscrew-destdir.diff -p1 + ./configure --prefix=/usr make make DESTDIR=$PKG install diff --git a/babl/unscrew-destdir.diff b/babl/unscrew-destdir.diff new file mode 100644 index 000000000..9d72206a5 --- /dev/null +++ b/babl/unscrew-destdir.diff @@ -0,0 +1,58 @@ +--- babl-0.1.0.orig/extensions/Makefile.am 2009-04-17 12:05:15.000000000 -0500 ++++ babl-0.1.0/extensions/Makefile.am 2009-08-19 00:53:21.435970261 -0500 +@@ -1,7 +1,7 @@ + if OS_WIN32 + AM_LDFLAGS = -module -no-undefined + else +-AM_LDFLAGS = -module ++AM_LDFLAGS = -module -avoid-version + endif + + noinst_HEADERS = util.h +@@ -12,7 +12,7 @@ + -I$(top_srcdir)/babl \ + -I$(top_srcdir)/extensions + +-extdir = $(DESTDIR)$(libdir)/babl-@BABL_API_VERSION@ ++extdir = $(libdir)/babl-@BABL_API_VERSION@ + ext_LTLIBRARIES = \ + CIE-Lab.la \ + gegl-fixups.la \ +--- babl-0.1.0.orig/extensions/Makefile.in 2009-10-08 18:53:10.291822456 +0200 ++++ babl-0.1.0/extensions/Makefile.in 2009-10-08 19:00:41.271777227 +0200 +@@ -288,12 +288,12 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-extLTLIBRARIES: $(ext_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(extdir)" || $(MKDIR_P) "$(DESTDIR)$(extdir)" ++ test -z "$(extdir)" || $(MKDIR_P) "$(extdir)" + @list='$(ext_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(extdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(extdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(extdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(extdir)/$$f"; \ + else :; fi; \ + done + +@@ -301,8 +301,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(ext_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(extdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(extdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(extdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(extdir)/$$p"; \ + done + + clean-extLTLIBRARIES: +@@ -453,7 +453,7 @@ + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) + installdirs: +- for dir in "$(DESTDIR)$(extdir)"; do \ ++ for dir in "$(extdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am