[csw-devel] SF.net SVN: gar:[16545] csw/mgar/pkg/gtk2/branches/2.24-raos
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Sat Dec 17 12:44:46 CET 2011
Revision: 16545
http://gar.svn.sourceforge.net/gar/?rev=16545&view=rev
Author: guengel
Date: 2011-12-17 11:44:45 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
gtk2/branches/2.24-raos: Moved some packages back into CSWgtk2. Added post-merge in order to adjust paths in docs.
Modified Paths:
--------------
csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile
csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall
Added Paths:
-----------
csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch
csw/mgar/pkg/gtk2/branches/2.24-raos/files/README.CSW
Removed Paths:
-------------
csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall
Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 11:00:37 UTC (rev 16544)
+++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 11:44:45 UTC (rev 16545)
@@ -39,10 +39,9 @@
DISTNAME = gtk+-$(VERSION)
DISTFILES = $(DISTNAME).tar.bz2
DISTFILES += CSWgtk2.postinstall
-DISTFILES += CSWgtk2-immodules.postinstall
+DISTFILES += README.CSW
-EXPANDVARS = CSWgtk2-immodules.postinstall
-EXPANDVARS += CSWgtk2.postinstall
+EXPANDVARS = CSWgtk2.postinstall
# This makes the tests work in the first place
PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch
@@ -57,6 +56,8 @@
# It goes together with the above patch.
PATCHFILES += 0000-Add-update-modules-cmd-line-option.patch
+PATCHFILES += 0000-Adjust-hardcoded-path-to-opt-csw-share.patch
+
PACKAGES += CSWgtk2
SPKG_DESC_CSWgtk2 = $(DESCRIPTION)
# Catchall
@@ -67,8 +68,6 @@
RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-engines
RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-papi
RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-file
-RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-cups
-RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-lpr
RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgailutil18
RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgtk-x112-0-0
# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will
@@ -92,86 +91,6 @@
RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibz1
RUNTIME_DEP_PKGS_CSWgtk2 += CSWpango
-PACKAGES += CSWgtk2-immodules
-SPKG_DESC_CSWgtk2-immodules = $(DESCRIPTION), IM Modules
-PKGFILES_CSWgtk2-immodules = .*/immodules/.*
-PKGFILES_CSWgtk2-immodules += .*/gtk-2.0/im-multipress.conf
-PKGFILES_CSWgtk2-immodules += .*/gtk-query-immodules-2.0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules = CSWlibgdk-x112-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgtk-x112-0-0
-# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be
-# called as well
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWgdkpixbuf
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWfconfig
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWftype2
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibpixman1-0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibz1
-RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWpango
-
-PACKAGES += CSWgtk2-modules
-SPKG_DESC_CSWgtk2-modules = $(DESCRIPTION), Modules
-PKGFILES_CSWgtk2-modules = .*/modules/.*
-RUNTIME_DEP_PKGS_CSWgtk2-modules = CSWlibgdk-x112-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgtk-x112-0-0
-# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be
-# called as well
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWgdkpixbuf
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWfconfig
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWftype2
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibpixman1-0
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibz1
-RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWpango
-
-PACKAGES += CSWgtk2-engines
-SPKG_DESC_CSWgtk2-engines = $(DESCRIPTION), Engines
-PKGFILES_CSWgtk2-engines = .*/engines/.*
-RUNTIME_DEP_PKGS_CSWgtk2-engines = CSWlibgdk-x112-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgtk-x112-0-0
-# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be
-# called as well
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWgdkpixbuf
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWfconfig
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWftype2
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibpixman1-0
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibz1
-RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWpango
-
PACKAGES += CSWgtk2-printbackends-papi
SPKG_DESC_CSWgtk2-printbackends-papi = $(DESCRIPTION), Print Backend
PKGFILES_CSWgtk2-printbackends-papi = .*/printbackends/libprintbackend-papi.*
@@ -411,6 +330,8 @@
BUILD_DEP_PKGS += CSWlibpng-dev
# Needed to make a test work
BUILD_DEP_PKGS += CSWgamin
+# Used to adjust documentation
+BUILD_DEP_PKGS += CSWgsed
BUILD64 = 1
@@ -433,3 +354,9 @@
CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
include gar/category.mk
+
+post-merge:
+ gsed -i -e 's|/usr/share/|$(sharedstatedir)/|g' \
+ -e 's|/usr/lib|$(libdir)|g' \
+ -e 's|/usr/include|$(includedir)|g' `find $(PKGROOT)$(sharedstatedir)/gtk-doc -type f`
+ @$(MAKECOOKIE)
\ No newline at end of file
Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch
===================================================================
--- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch (rev 0)
+++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch 2011-12-17 11:44:45 UTC (rev 16545)
@@ -0,0 +1,25 @@
+From f84f9b4ba14c5d02547e80853da005cd97001d12 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Sat, 17 Dec 2011 12:41:47 +0100
+Subject: [PATCH] Adjust hardcoded path to /opt/csw/share
+
+---
+ demos/testpixbuf-color.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/demos/testpixbuf-color.c b/demos/testpixbuf-color.c
+index 003f333..851a15b 100644
+--- a/demos/testpixbuf-color.c
++++ b/demos/testpixbuf-color.c
+@@ -6,7 +6,7 @@
+
+ #include <gtk/gtk.h>
+
+-#define ICC_PROFILE "/usr/share/color/icc/bluish.icc"
++#define ICC_PROFILE "/opt/csw/share/color/icc/bluish.icc"
+ #define ICC_PROFILE_SIZE 3966
+
+ static gboolean
+--
+1.7.6.1
+
Deleted: csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall
===================================================================
--- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall 2011-12-17 11:00:37 UTC (rev 16544)
+++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall 2011-12-17 11:44:45 UTC (rev 16545)
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# We will call gtk-query-immodules-2.0 for all ISAs
-#
-# Attention: the OpenCSW gtk-query-immodules-2.0 has been patched to
-# support a command line option `--update-modules' to create the
-# gtk.immodules (32bit executable) and gtk.immodules-64 (64bit
-# executable) file.
-
-umask 0022
-
-BIN=gtk-query-immodules-2.0
-BIN_OPTS="--update-modules"
-
-echo "** Querying IM Modules"
-
-# But first, do the obvious
-/usr/bin/printf "- Default ISA... "
- at prefix@/bin/${BIN} ${BIN_OPTS} >/dev/null 2>&1
-if [ $? -ne 0 ]
-then
- echo "Error"
-else
- echo "OK"
-fi
-
-# Now, do all other
-for i in @BUILD_ISAS@
-do
- ISABIN=@prefix@/bin/$i/${BIN}
- if [ -x "${ISABIN}" ]
- then
- /usr/bin/printf "- $i ISA... "
- "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1
- if [ $? -ne 0 ]
- then
- echo "Error"
- else
- echo "OK"
- fi
- fi
-done
-
-echo "** Done querying IM Modules"
Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall
===================================================================
--- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-17 11:00:37 UTC (rev 16544)
+++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-17 11:44:45 UTC (rev 16545)
@@ -24,3 +24,36 @@
echo "** Done Updating Icon cache"
+BIN=gtk-query-immodules-2.0
+BIN_OPTS="--update-modules"
+
+echo "** Querying IM Modules"
+
+# But first, do the obvious
+/usr/bin/printf "- Default ISA... "
+ at prefix@/bin/${BIN} ${BIN_OPTS} >/dev/null 2>&1
+if [ $? -ne 0 ]
+then
+ echo "Error"
+else
+ echo "OK"
+fi
+
+# Now, do all other
+for i in @NEEDED_ISAS@
+do
+ ISABIN=@prefix@/bin/$i/${BIN}
+ if [ -x "${ISABIN}" ]
+ then
+ /usr/bin/printf "- $i ISA... "
+ "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1
+ if [ $? -ne 0 ]
+ then
+ echo "Error"
+ else
+ echo "OK"
+ fi
+ fi
+done
+
+echo "** Done querying IM Modules"
\ No newline at end of file
Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/README.CSW
===================================================================
--- csw/mgar/pkg/gtk2/branches/2.24-raos/files/README.CSW (rev 0)
+++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/README.CSW 2011-12-17 11:44:45 UTC (rev 16545)
@@ -0,0 +1,26 @@
+GTK+ 2
+======
+
+
+Printer Backends
+----------------
+
+By default, only the file printer backend will be installed. If
+support for CUPS is required, the package `gtk2_printbackends_cups`
+has to be installed by calling
+
+ /opt/csw/bin/pkgutil -i gtk2_printbackends_cups
+
+Support for the LPR printer backend can be enabled by installing
+`gtk2_printbackends_lpr`:
+
+ /opt/csw/bin/pkgutil -i gtk2_printbackends_lpr
+
+
+gtk-query-immodules-2.0
+-----------------------
+
+The gtk-query-immodules-2.0 that comes with OpenCSW's GTK+ 2 has a
+command line argument `--update-modules' which is not found in the
+upstream release of GTK+ 2. It will update the file gtk.immodules in
+the default location using the standard IM Modules search path.
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