Revision: 19382 http://gar.svn.sourceforge.net/gar/?rev=19382&view=rev Author: cgrzemba Date: 2012-10-05 08:44:54 +0000 (Fri, 05 Oct 2012) Log Message: ----------- gthumb/trunk: rebuild, minor version bump
Modified Paths: -------------- csw/mgar/pkg/gthumb/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gthumb/trunk/files/0001-configure.ac.patch Modified: csw/mgar/pkg/gthumb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gthumb/trunk/Makefile 2012-10-04 19:43:51 UTC (rev 19381) +++ csw/mgar/pkg/gthumb/trunk/Makefile 2012-10-05 08:44:54 UTC (rev 19382) @@ -3,33 +3,34 @@ # NAME = gthumb VERSION = 2.10.12 +# VERSION = 2.12.4 SUBDIR=$(basename $(VERSION)) GARTYPE = v2 CATEGORIES = gnome -DESCRIPTION = Brief description +DESCRIPTION = Image organizer define BLURB - Long description + gThumb is an image viewer and browser for the GNOME Desktop. It also includes an importer tool for transferring photos from cameras. endef -MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gthumb/$(SUBDIR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gthumb/$(SUBDIR)/ +DISTFILES = $(NAME)-$(VERSION).tar.gz # xz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - GARCOMPILER = SOS12U3 -PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 STRIP_LIBTOOL = 1 +# PATCHFILES += 0001-configure.ac.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 += CSWlibsoupdevel +# BUILD_DEP_PKGS += CSWgnomekeyring-dev + PACKAGES += CSWlibgthumb PKGFILES_CSWlibgthumb += $(call baseisadirs,$(libdir),libgthumb\.so) SPKG_DESC_CSWlibgthumb += $(DESCRIPTION), libgthumb.so @@ -40,13 +41,13 @@ RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibexif12 RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnomecanvas +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 += CSWlibgnome +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 @@ -80,13 +81,13 @@ RUNTIME_DEP_PKGS_CSWgthumb += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibexif12 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnomecanvas +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 += CSWlibgnome +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 @@ -110,8 +111,17 @@ # 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 include gar/category.mk +# pre-configure-modulated: +# cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force +# cd $(WORKSRC) && aclocal +# cd $(WORKSRC) && autoconf --force +# cd $(WORKSRC) && automake -a -c -f +# @$(MAKECOOKIE) + PATH:=/opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gthumb/trunk/files/0001-configure.ac.patch =================================================================== --- csw/mgar/pkg/gthumb/trunk/files/0001-configure.ac.patch (rev 0) +++ csw/mgar/pkg/gthumb/trunk/files/0001-configure.ac.patch 2012-10-05 08:44:54 UTC (rev 19382) @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -61,7 +61,7 @@ LIBCHAMPLAIN_REQUIRED=0.8.0 + dnl =========================================================================== + + CFLAGS=${CFLAGS-:""} +-CFLAGS="$CFLAGS -fPIC -DPIC -Wl,--as-needed" ++CFLAGS="$CFLAGS -fPIC -DPIC" + + AC_ARG_ENABLE(deprecated, + AS_HELP_STRING([--disable-deprecated], [do not use deprecated API]), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel