SF.net SVN: gar:[23629] csw/mgar/pkg/gtk2/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Sat May 17 17:24:24 CEST 2014
Revision: 23629
http://sourceforge.net/p/gar/code/23629
Author: guengel
Date: 2014-05-17 15:24:19 +0000 (Sat, 17 May 2014)
Log Message:
-----------
gtk2/trunk: Update dependencies and overrides. Added changelog.CSW
Modified Paths:
--------------
csw/mgar/pkg/gtk2/trunk/Makefile
csw/mgar/pkg/gtk2/trunk/files/changelog.CSW
Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile 2014-05-17 12:34:43 UTC (rev 23628)
+++ csw/mgar/pkg/gtk2/trunk/Makefile 2014-05-17 15:24:19 UTC (rev 23629)
@@ -26,6 +26,7 @@
DISTFILES = $(DISTNAME).tar.xz
DISTFILES += CSWgtk2.postinstall
DISTFILES += README.CSW
+DISTFILES += changelog.CSW
EXPANDVARS = CSWgtk2.postinstall
@@ -53,10 +54,13 @@
RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgtk2 += CSWpango
RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWgtk2 += CSWglib2
RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWpango # This is used to so that pango-querymodules is run
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpangocairo1-0-0
# This is required for gtk-update-icon-cache, so that it doesn't fail in the
# postinstall script.
RUNTIME_DEP_PKGS_CSWgtk2 += CSWhicoloricontheme
@@ -64,6 +68,7 @@
CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWgdkpixbuf
CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWhicoloricontheme
CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWglib2
+CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWpango
# Remove after -z ignore issue has been resolved
CHECKPKG_OVERRIDES_CSWgtk2 += soname-unused
RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxrender
@@ -74,7 +79,10 @@
CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibxrender
CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibgio2-0-0
CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibpangoft2-1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWlibpangocairo1-0-0
+
PACKAGES += CSWgtk2-printbackends-papi
ARCHALL_CSWgtk2-printbackends-papi = 1
SPKG_DESC_CSWgtk2-printbackends-papi = $(DESCRIPTION), Print Backend (OBSOLETE)
@@ -91,6 +99,9 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpangocairo1-0-0
# Remove after -z ignore issue has been resolved
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += soname-unused
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgmodule2-0-0
@@ -99,16 +110,17 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibxrender
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWpango
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibfontconfig1
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibfontconfig1
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibgmodule2-0-0
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibintl8
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibxrender
-CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWpango
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibatk1-0-0
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibfreetype6
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibgdk-pixbuf2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibpangoft2-1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibpangocairo1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWlibpango1-0-0
PACKAGES += CSWgtk2-printbackends-cups
SPKG_DESC_CSWgtk2-printbackends-cups = $(DESCRIPTION), CUPS Print Backend
@@ -121,6 +133,9 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpangocairo1-0-0
# Remove after -z ignore issue has been resolved
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += soname-unused
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgmodule2-0-0
@@ -131,7 +146,6 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibxrender
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWpango
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibfontconfig1
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgnutls28
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgio2-0-0
@@ -140,13 +154,15 @@
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibintl8
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibxrender
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgpg-error0
-CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWpango
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibz1
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibatk1-0-0
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibfreetype6
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgdk-pixbuf2-0-0
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgnutls28
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibgio2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibpangoft2-1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibpangocairo1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWlibpango1-0-0
PACKAGES += CSWgtk2-printbackends-lpr
@@ -158,6 +174,9 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpangocairo1-0-0
# Remove once -z ignore issue has been resolved
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += soname-unused
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgmodule2-0-0
@@ -167,19 +186,20 @@
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibxrender
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWpango
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibfontconfig1
RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibatk1-0-0
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibfontconfig1
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgmodule2-0-0
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibintl8
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibxrender
-CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWpango
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgdk-x11-2-0-0
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibatk1-0-0
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibfreetype6
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgdk-pixbuf2-0-0
CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibgio2-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibpangoft2-1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibpangocairo1-0-0
+CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWlibpango1-0-0
PACKAGES += CSWlibgailutil18
SPKG_DESC_CSWlibgailutil18 = $(DESCRIPTION), libgailutil
@@ -190,8 +210,10 @@
RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWpango
RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpangocairo1-0-0
# Remove once -z ignore issue has been resolved
CHECKPKG_OVERRIDES_CSWlibgailutil18 += soname-unused
RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgmodule2-0-0
@@ -210,6 +232,8 @@
CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibgio2-0-0
CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibfreetype6
CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibgdk-pixbuf2-0-0
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibpangoft2-1-0-0
+CHECKPKG_OVERRIDES_CSWlibgailutil18 += surplus-dependency|CSWlibpangocairo1-0-0
PACKAGES += CSWlibgdk-x11-2-0-0
SPKG_DESC_CSWlibgdk-x11-2-0-0 = $(DESCRIPTION), libgdk-x11-2.0
@@ -223,12 +247,15 @@
RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWpango
RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibpangocairo1-0-0
# Remove once -z ignore issue has been resolved
CHECKPKG_OVERRIDES_CSWlibgdk-x11-2-0-0 += soname-unused
RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgmodule2-0-0
CHECKPKG_OVERRIDES_CSWlibgdk-x11-2-0-0 += surplus-dependency|CSWlibgmodule2-0-0
+CHECKPKG_OVERRIDES_CSWlibgdk-x11-2-0-0 += surplus-dependency|CSWlibfreetype6
PACKAGES += CSWlibgtk-x11-2-0-0
SPKG_DESC_CSWlibgtk-x11-2-0-0 = $(DESCRIPTION), libgtk-x11-2.0
@@ -244,14 +271,18 @@
RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgmodule2-0-0
RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWpango
RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWpango # This is used so that pango-querymodules is run
# remove after -z ignore issue has been resolved
CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += soname-unused
RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibxrender
RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibfreetype6
CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += surplus-dependency|CSWlibfreetype6
CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += surplus-dependency|CSWlibxrender
+CHECKPKG_OVERRIDES_CSWlibgtk-x11-2-0-0 += surplus-dependency|CSWpango
PACKAGES += CSWlibgtk2-dev
SPKG_DESC_CSWlibgtk2-dev = $(DESCRIPTION), Development files
@@ -279,19 +310,22 @@
RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgtk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpango
-RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpangodevel
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpango-dev
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpangocairo1-0-0
OBSOLETED_BY_CSWlibgtk2-dev = CSWgtk2devel
CATALOGNAME_CSWgtk2devel = gtk2_devel_stub
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibgdk-pixbuf-dev
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibcairo-dev
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibatk-dev
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibglib2-dev
-CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWpangodevel
+CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibpango-dev
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgtk2
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgdkpixbuf
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += soname-unused
CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibfreetype6
PACKAGES += CSWgtk2doc
SPKG_DESC_CSWgtk2doc = $(DESCRIPTION), Documentation
@@ -306,7 +340,7 @@
BUILD_DEP_PKGS += CSWcups-dev
BUILD_DEP_PKGS += CSWlibglib2-dev
BUILD_DEP_PKGS += CSWlibatk-dev
-BUILD_DEP_PKGS += CSWpangodevel
+BUILD_DEP_PKGS += CSWlibpango-dev
BUILD_DEP_PKGS += CSWlibcairo-dev
BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev
BUILD_DEP_PKGS += CSWsunx11devel
Modified: csw/mgar/pkg/gtk2/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/gtk2/trunk/files/changelog.CSW 2014-05-17 12:34:43 UTC (rev 23628)
+++ csw/mgar/pkg/gtk2/trunk/files/changelog.CSW 2014-05-17 15:24:19 UTC (rev 23629)
@@ -1,9 +1,9 @@
-gtk2 (2.24.22,REV=2014.05.11)
+gtk2 (2.24.22,REV=2014.05.17)
* let gtk-query-immodules-2.0 write
/opt/csw/lib/gtk-2.0/2.10.0/immodules.cache in postinstall script
instead of /etc/opt/csw/gtk-2.0/gtk.immodules, which had no effect.
- -- Rafael Ostertag <rafisol at opencsw.org> Sun, 11 May 2014 18:25:18 +0200
+ -- Rafael Ostertag <rafisol at opencsw.org> Sat, 17 May 2014 15:02:48 +0200
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