[csw-devel] SF.net SVN: gar:[16554] csw/mgar/pkg/gdk-pixbuf/trunk

guengel at users.sourceforge.net guengel at users.sourceforge.net
Sat Dec 17 21:21:43 CET 2011 

Revision: 16554
          http://gar.svn.sourceforge.net/gar/?rev=16554&view=rev
Author:   guengel
Date:     2011-12-17 20:21:43 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
gdk-pixbuf/trunk: Got rid of CSWgdkpixbuf-loaders (merged into CSWgdkpixbuf).

Modified Paths:
--------------
    csw/mgar/pkg/gdk-pixbuf/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall

Removed Paths:
-------------
    csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall

Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile	2011-12-17 16:49:48 UTC (rev 16553)
+++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile	2011-12-17 20:21:43 UTC (rev 16554)
@@ -18,7 +18,7 @@
 # A simple test with emacs-gtk and gftp does not indicate that
 # installing gdk-pixbuf over an existing gtk 2.18 installation does
 # break anything.
-CHECKPKG_OVERRIDES_CSWgdkpixbuf-loaders += file-collision|/opt/csw/bin/gdk-pixbuf-query-loaders|CSWgdkpixbuf-loaders|CSWgtk2
+CHECKPKG_OVERRIDES_CSWgdkpixbuf += file-collision|/opt/csw/bin/gdk-pixbuf-query-loaders|CSWgdkpixbuf|CSWgtk2
 CHECKPKG_OVERRIDES_CSWgdkpixbuf += file-collision|/opt/csw/bin/gdk-pixbuf-csource|CSWgdkpixbuf|CSWgtk2
 CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html|CSWgdkpixbuf-doc|CSWgtk2doc
 CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html|CSWgdkpixbuf-doc|CSWgtk2doc
@@ -74,9 +74,9 @@
 
 MASTER_SITES = $(GNOME_MIRROR)
 DISTFILES  = $(DISTNAME).tar.xz
-DISTFILES += CSWgdkpixbuf-loaders.postinstall
+DISTFILES += CSWgdkpixbuf.postinstall
 
-EXPANDVARS = CSWgdkpixbuf-loaders.postinstall
+EXPANDVARS = CSWgdkpixbuf.postinstall
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -86,7 +86,6 @@
 SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWgdkpixbuf  = CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWgdkpixbuf-loaders
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgmodule2-0-0
@@ -94,10 +93,11 @@
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibtiff3
 # I assume if one installs CSWgdkpixbuf, one wants all the stuff
 # except -dev
 CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWlibgdk-pixbuf-xlib2-0-0
-CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWgdkpixbuf-loaders
 CHECKPKG_OVERRIDES_CSWgdkpixbuf += catalogname-does-not-match-pkgname|pkgname=CSWgdkpixbuf|catalogname=gdk_pixbuf|expected-catalogname=gdkpixbuf
 
 PACKAGES += CSWgdkpixbuf-doc
@@ -131,24 +131,6 @@
 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0
 
-PACKAGES += CSWgdkpixbuf-loaders
-# To retain backwards compatibility with gdk pixbuf package 0.22
-CATALOGNAME_CSWgdkpixbuf-loaders = gdk_pixbuf_loaders
-SPKG_DESC_CSWgdkpixbuf-loaders = $(DESCRIPTION), loader modules
-PKGFILES_CSWgdkpixbuf-loaders  = .*/loaders/.*\.so
-PKGFILES_CSWgdkpixbuf-loaders += .*/gdk-pixbuf-query-loaders
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders  = CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibtiff3
-CHECKPKG_OVERRIDES_CSWgdkpixbuf-loaders += catalogname-does-not-match-pkgname|pkgname=CSWgdkpixbuf-loaders|catalogname=gdk_pixbuf_loaders|expected-catalogname=gdkpixbuf_loaders
-
 PACKAGES += CSWlibgdk-pixbuf-dev
 SPKG_DESC_CSWlibgdk-pixbuf-dev = Developtment files $(DESCRIPTION)
 PKGFILES_CSWlibgdk-pixbuf-dev = $(PKGFILES_DEVEL)
@@ -156,6 +138,8 @@
 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf-xlib2-0-0
 
+
+
 BUILD_DEP_PKGS  = CSWggettext-dev
 BUILD_DEP_PKGS += CSWjbigkit
 BUILD_DEP_PKGS += CSWlibglib2-dev

Deleted: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall
===================================================================
--- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall	2011-12-17 16:49:48 UTC (rev 16553)
+++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall	2011-12-17 20:21:43 UTC (rev 16554)
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# We will call gdk-pixbuf-query-loaders for all ISAs
-
-umask 0022
-
-
-GDKPBQUERY=gdk-pixbuf-query-loaders
-GDKPBQUERY_OPTS="--update-cache"
-
-if [ "${PKG_ROOT_DIR}" = "" ]
-then
-    PKG_ROOT_DIR=/
-fi
-
-if [ -z "${PKGINST}" ]
-then
-    PKGINST=CSWgdkpixbuf-loaders
-fi
-
-echo "** Updating GDK pixbuf loaders"
-
-for i in @NEEDED_ISAS@
-do
-    # The default ISA is removed
-    isa="`echo $i | /usr/bin/sed -e 's|@ISA_DEFAULT@||g'`"
-    queryloader=@prefix@/bin/${isa}/gdk-pixbuf-query-loaders
-    if [ -x "${PKG_ROOT_DIR}${queryloader}" ]
-    then
-	if [ -z "${isa}" ]
-	then
-	    /usr/bin/printf "- Default ISA... "
-	else
-	    /usr/bin/printf "- ${isa} ISA... "
-	fi
-
-        # Figure out the directory where loaders.cache is stored
-	loaders_dir="`${queryloader} | /usr/bin/awk '/LoaderDir/ { print $4 }'`"
-	loaders_cache_dir="`/usr/bin/dirname "${loaders_dir}
-	# Now we got the file
-	loaders_cache_file="${loaders_cache_dir}/loaders.cache"
-
-	/usr/sbin/chroot "${PKG_ROOT_DIR}" "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1
-	if [ $? -ne 0 ]
-	then
-	    echo "Error"
-	else
-	    /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${loaders_cache_file} f 0644 root bin
-	    echo "OK"
-	fi
-    fi
-done
-
-/usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST}
-
-echo "** Done updating GDK pixbuf loaders"

Copied: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall (from rev 16551, csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall)
===================================================================
--- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall	                        (rev 0)
+++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall	2011-12-17 20:21:43 UTC (rev 16554)
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# We will call gdk-pixbuf-query-loaders for all ISAs
+
+umask 0022
+
+
+GDKPBQUERY=gdk-pixbuf-query-loaders
+GDKPBQUERY_OPTS="--update-cache"
+
+if [ "${PKG_ROOT_DIR}" = "" ]
+then
+    PKG_ROOT_DIR=/
+fi
+
+if [ -z "${PKGINST}" ]
+then
+    PKGINST=CSWgdkpixbuf-loaders
+fi
+
+echo "** Updating GDK pixbuf loaders"
+
+for i in @NEEDED_ISAS@
+do
+    # The default ISA is removed
+    isa="`echo $i | /usr/bin/sed -e 's|@ISA_DEFAULT@||g'`"
+    queryloader=@prefix@/bin/${isa}/gdk-pixbuf-query-loaders
+    if [ -x "${PKG_ROOT_DIR}${queryloader}" ]
+    then
+	if [ -z "${isa}" ]
+	then
+	    /usr/bin/printf "- Default ISA... "
+	else
+	    /usr/bin/printf "- ${isa} ISA... "
+	fi
+
+        # Figure out the directory where loaders.cache is stored
+	loaders_dir="`${queryloader} | /usr/bin/awk '/LoaderDir/ { print $4 }'`"
+	loaders_cache_dir="`/usr/bin/dirname "${loaders_dir}
+	# Now we got the file
+	loaders_cache_file="${loaders_cache_dir}/loaders.cache"
+
+	/usr/sbin/chroot "${PKG_ROOT_DIR}" "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1
+	if [ $? -ne 0 ]
+	then
+	    echo "Error"
+	else
+	    /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${loaders_cache_file} f 0644 root bin
+	    echo "OK"
+	fi
+    fi
+done
+
+/usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST}
+
+echo "** Done updating GDK pixbuf loaders"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list