[csw-devel] SF.net SVN: gar:[17511] csw/mgar/pkg/evince/trunk

[cgrzemba at users.sourceforge.net]

Revision: 17511
          http://gar.svn.sourceforge.net/gar/?rev=17511&view=rev
Author:   cgrzemba
Date:     2012-03-22 09:32:49 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
evince/trunk: bump version 2.30.3

Modified Paths:
--------------
    csw/mgar/pkg/evince/trunk/Makefile
    csw/mgar/pkg/evince/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/evince/trunk/files/0001-honor-aclocal_flags.patch

Modified: csw/mgar/pkg/evince/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evince/trunk/Makefile	2012-03-22 08:08:04 UTC (rev 17510)
+++ csw/mgar/pkg/evince/trunk/Makefile	2012-03-22 09:32:49 UTC (rev 17511)
@@ -3,25 +3,36 @@
 # $Id$
 
 NAME = evince
-GNOME_VERSION = 2.24
-VERSION = $(GNOME_VERSION).2
+GNOME_VERSION = 2.30
+VERSION = $(GNOME_VERSION).3
 CATEGORIES = gnome
 GARTYPE = v2
 DESCRIPTION = Document viewer for multiple document formats
 define BLURB
 endef
-GARFLAVOR = DBG
+
+# GARFLAVOR = DBG
+# GARCOMPILER=GNU
+GARCOMPILER=SOS12U3
 SPKG_SOURCEURL = http://projects.gnome.org/evince/
 MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(GNOME_VERSION)/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+
+PATCHFILES += 0001-honor-aclocal_flags.patch
+
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS_DBG = --enable-debug
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
-EXTRA_CFLAGS_DBG = -g
-EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR))
+# CONFIGURE_ARGS_DBG = --enable-debug
+# CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+
+# EXTRA_CFLAGS_DBG = -g
+# EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR))
+# EXTRA_CXXFLAGS += -DPOPPLER_WITH_GDK
+EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO
+
 STRIP_LIBTOOL = 1
-EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm
+EXTRA_LD_OPTIONS = -lm
+# EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm
 # There are no shared-object dependencies on CSWdbus, but it's required for
 # evince to work.
 RUNTIME_DEP_PKGS_CSWevince += CSWdbus
@@ -55,4 +66,12 @@
 RUNTIME_DEP_PKGS_CSWevince += CSWzlib
 
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWevince)
+
 include gar/category.mk
+
+pre-configure-modulated:
+	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
+	cd $(WORKSRC) && autoreconf
+	@$(MAKECOOKIE)
+
+PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/evince/trunk/checksums
===================================================================
--- csw/mgar/pkg/evince/trunk/checksums	2012-03-22 08:08:04 UTC (rev 17510)
+++ csw/mgar/pkg/evince/trunk/checksums	2012-03-22 09:32:49 UTC (rev 17511)
@@ -1 +1 @@
-9b190961795bcb0394502597470420db  evince-2.24.2.tar.gz
+4614e108cc4fda94bac2a242e490408a  evince-2.30.3.tar.gz

Added: csw/mgar/pkg/evince/trunk/files/0001-honor-aclocal_flags.patch
===================================================================
--- csw/mgar/pkg/evince/trunk/files/0001-honor-aclocal_flags.patch	                        (rev 0)
+++ csw/mgar/pkg/evince/trunk/files/0001-honor-aclocal_flags.patch	2012-03-22 09:32:49 UTC (rev 17511)
@@ -0,0 +1,22 @@
+From e43d918efb08a9049d6489a854f3171aa4330609 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 19 Mar 2012 16:09:43 +0100
+Subject: [PATCH] honor aclocal_flags
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4647ca4..8488dc3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-ACLOCAL_AMFLAGS = -I m4
++ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
+ 
+ # Set the minimum required Windows version to Windows 2000 (0x0500).
+ if PLATFORM_WIN32
+-- 
+1.7.9
+

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