Revision: 22822
http://sourceforge.net/p/gar/code/22822
Author: cgrzemba
Date: 2014-01-14 10:19:07 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
gthumb/trunk: update version 2.12
Modified Paths:
--------------
csw/mgar/pkg/gthumb/trunk/Makefile
csw/mgar/pkg/gthumb/trunk/checksums
Modified: csw/mgar/pkg/gthumb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gthumb/trunk/Makefile 2014-01-13 23:08:39 UTC (rev 22821)
+++ csw/mgar/pkg/gthumb/trunk/Makefile 2014-01-14 10:19:07 UTC (rev 22822)
@@ -2,8 +2,8 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = gthumb
-VERSION = 2.10.12
-# VERSION = 2.12.4
+# VERSION = 2.10.12
+VERSION = 2.12.4
SUBDIR=$(basename $(VERSION))
GARTYPE = v2
CATEGORIES = gnome
@@ -14,106 +14,102 @@
endef
MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gthumb/$(SUBDIR)/
-DISTFILES = $(NAME)-$(VERSION).tar.gz # xz
+DISTFILES = $(NAME)-$(VERSION).tar.xz
-GARCOMPILER = SOS12U3
+GARCOMPILER = GCC4
+# GARCOMPILER = SOS12U3
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
STRIP_LIBTOOL = 1
# PATCHFILES += 0001-configure.ac.patch
+# PATCHFILES += mkdtemp-patch
-PATCHFILES += mkdtemp-patch
-
BUILD_DEP_PKGS += CSWlibgtk2-dev
BUILD_DEP_PKGS += CSWlibglib2-dev
BUILD_DEP_PKGS += CSWlibgconf-dev
BUILD_DEP_PKGS += CSWlibexif-dev
-# BUILD_DEP_PKGS += CSWlibunique-dev
+BUILD_DEP_PKGS += CSWlibunique-dev
+BUILD_DEP_PKGS += CSWlibharfbuzz-dev
# BUILD_DEP_PKGS += CSWlibsoupdevel
# BUILD_DEP_PKGS += CSWgnomekeyring-dev
-PACKAGES += CSWlibgthumb
-PKGFILES_CSWlibgthumb += $(call baseisadirs,$(libdir),libgthumb\.so)
-SPKG_DESC_CSWlibgthumb += $(DESCRIPTION), libgthumb.so
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnomeui2-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibexif12
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnomecanvas2-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibpopt0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnome2-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWorbit2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgdk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgconf2-4
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibglade2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWpango
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibbonoboui
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibart
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWgnomevfs2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibbonobo2
-RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibglib2-0-0
-# this is reported because lib was not split out in the old package
-# CHECKPKG_OVERRIDES_CSWlibgthumb +=
file-collision|/opt/csw/lib/libgthumb.so|CSWgthumb|CSWlibgthumb
-# there is really only the .so name
-CHECKPKG_OVERRIDES_CSWlibgthumb +=
soname-equals-filename|file=/opt/csw/lib/libgthumb.so
+PACKAGES += CSWgthumb-extensions
+CATALOGNAME_CSWgthumb-extensions = gthumb_extensions
+PKGFILES_CSWgthumb-extensions += $(call
baseisadirs,$(libdir)/gthumb/extensions,.*)
+SPKG_DESC_CSWgthumb-extensions += $(DESCRIPTION), extensions
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgstreamer0-10-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibsoup-gnome2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgstinterfaces0-10-0
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibsoup2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb-extensions += CSWlibpangocairo1-0-0
+PACKAGES += CSWgthumb-dev
+CATALOGNAME_CSWgthumb-dev = gthumb_dev
+PKGFILES_CSWgthumb-dev += $(PKGFILES_DEVEL)
+SPKG_DESC_CSWgthumb-dev += $(DESCRIPTION), header files
+
+PACKAGES += CSWgthumb-data
+CATALOGNAME_CSWgthumb-data = gthumb_data
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/gthumb # $(call catalogname,$P)
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/gnome
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/icons
+PKGFILES_CSWgthumb-data += $(sharedstatedir)/locale
+PKGFILES_CSWgthumb-data += $(sysconfigdir)/gconf
+SPKG_DESC_CSWgthumb-data += $(DESCRIPTION), arch-independent files
+
PACKAGES += CSWgthumb
+CATALOGNAME_CSWgthumb = gthumb
SPKG_DESC_CSWgthumb += $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgthumb
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnomeui2-0
+RUNTIME_DEP_PKGS_CSWgthumb += CSWgthumb-data
+RUNTIME_DEP_PKGS_CSWgthumb += CSWgthumb-extensions
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibxrender
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibexif12
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnomecanvas2-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpopt0
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibintl8
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgdk-x11-2-0-0
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnome2-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWorbit2
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibz1
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgconf2-4
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibglade2
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWpango
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibbonoboui
-RUNTIME_DEP_PKGS_CSWgthumb += CSWgnomevfs2
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibart
-RUNTIME_DEP_PKGS_CSWgthumb += CSWlibbonobo2
RUNTIME_DEP_PKGS_CSWgthumb += CSWlibatk1-0-0
EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/var/lib.*
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpango1-0-0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpng15-15
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnome-keyring0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgstreamer0-10-0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibsoup-gnome2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibunique1-0-0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgstinterfaces0-10-0
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgcc-s1
+# RUNTIME_DEP_PKGS_CSWgthumb += CSWlibsoup2-4-1
+RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpangocairo1-0-0
+CHECKPKG_OVERRIDES_CSWgthumb += surplus-dependency|CSWgthumb-extensions
+CHECKPKG_OVERRIDES_CSWgthumb += surplus-dependency|CSWgthumb-data
+
# for xmllint
EXTRA_TEST_ENV += http_proxy=http://proxy:3128
EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-gnome-3
+# xmllint failed because of missing variable malrng in gnome-doc-utils.pc
+SKIPTEST = 1
include gar/category.mk
Modified: csw/mgar/pkg/gthumb/trunk/checksums
===================================================================
--- csw/mgar/pkg/gthumb/trunk/checksums 2014-01-13 23:08:39 UTC (rev 22821)
+++ csw/mgar/pkg/gthumb/trunk/checksums 2014-01-14 10:19:07 UTC (rev 22822)
@@ -1 +1 @@
-14732ffc8b5cea9a80e32de6c34480b3 gthumb-2.10.12.tar.gz
+5a1a4c10602c6bfaf6cc47add3bcfe21 gthumb-2.12.4.tar.xz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
