SF.net SVN: gar:[26051] csw/mgar/pkg/evince/trunk

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Fri Nov 25 15:28:47 CET 2016


Revision: 26051
          http://sourceforge.net/p/gar/code/26051
Author:   cgrzemba
Date:     2016-11-25 14:28:46 +0000 (Fri, 25 Nov 2016)
Log Message:
-----------
mantis-5292: relax postinstall on non-global zones

Modified Paths:
--------------
    csw/mgar/pkg/evince/trunk/Makefile
    csw/mgar/pkg/evince/trunk/checksums
    csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall

Modified: csw/mgar/pkg/evince/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evince/trunk/Makefile	2016-11-24 16:28:34 UTC (rev 26050)
+++ csw/mgar/pkg/evince/trunk/Makefile	2016-11-25 14:28:46 UTC (rev 26051)
@@ -3,8 +3,8 @@
 # $Id$
 
 NAME = evince
-GNOME_VERSION = 2.32
-VERSION = $(GNOME_VERSION).0
+GNOME_VERSION = 2.91
+VERSION = $(GNOME_VERSION).93
 CATEGORIES = gnome
 GARTYPE = v2
 DESCRIPTION = Document viewer for multiple document formats: pdf, ps ,dvi
@@ -13,19 +13,19 @@
 
 SPKG_SOURCEURL = http://projects.gnome.org/evince/
 MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(GNOME_VERSION)/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES  = $(NAME)-$(VERSION).tar.xz
 DISTFILES += CSWevince.postinstall
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 # GARFLAVOR = DBG
-GARCOMPILER=GCC4
+GARCOMPILER=GCC5
 # GARCOMPILER=SOS12U3
 STRIP_LIBTOOL = 1
 
 PATCHFILES += 0001-honor-aclocal_flags.patch
 # PATCHFILES += 0002-poppler-api-changed.patch
 # PATCHFILES += 0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch
-PATCHFILES += 0001-fix-poppler-api-linearized-problem.patch
+# PATCHFILES += 0001-fix-poppler-api-linearized-problem.patch
 # remove this patch if Mantis 5130 is closed!!!
 
 # PATCHFILES += 0003-libxml-2.0.pc-workaround
@@ -261,6 +261,7 @@
 BUILD_DEP_PKGS += CSWgnomedocutils
 BUILD_DEP_PKGS += CSWintltool
 BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibz-dev
 BUILD_DEP_PKGS += CSWlibxml2-dev
 BUILD_DEP_PKGS += CSWgnomeicontheme
 BUILD_DEP_PKGS += CSWsunx11devel
@@ -269,13 +270,13 @@
 BUILD_DEP_PKGS += CSWlibdbus-glib-dev
 BUILD_DEP_PKGS += CSWpoppler-dev
 BUILD_DEP_PKGS += CSWlibcairo-dev
+BUILD_DEP_PKGS += CSWlibpango-dev
 BUILD_DEP_PKGS += CSWlibspectre-dev
 BUILD_DEP_PKGS += CSWlibdjvulibre-dev
 BUILD_DEP_PKGS += CSWgobject-introspection-dev
 BUILD_DEP_PKGS += CSWbinutils
 BUILD_DEP_PKGS += CSWgnulinks
 BUILD_DEP_PKGS += CSWtetex
-BUILD_DEP_PKGS += CSWpangodevel
 BUILD_DEP_PKGS += CSWlibpixman-dev
 BUILD_DEP_PKGS += CSWlibfreetype-dev
 BUILD_DEP_PKGS += CSWlibpng-dev

Modified: csw/mgar/pkg/evince/trunk/checksums
===================================================================
--- csw/mgar/pkg/evince/trunk/checksums	2016-11-24 16:28:34 UTC (rev 26050)
+++ csw/mgar/pkg/evince/trunk/checksums	2016-11-25 14:28:46 UTC (rev 26051)
@@ -1 +1 @@
-f2621208fe255acab4172c0216a55504  evince-2.32.0.tar.gz
+a57956bfabb65c26f29263f5b14b9a7a  evince-3.21.4.tar.xz

Modified: csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall
===================================================================
--- csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall	2016-11-24 16:28:34 UTC (rev 26050)
+++ csw/mgar/pkg/evince/trunk/files/CSWevince.postinstall	2016-11-25 14:28:46 UTC (rev 26051)
@@ -1 +1,13 @@
-/opt/csw/bin/glib-compile-schemas /opt/csw/share/glib-2.0/schemas/
+zname=`zonename`
+if  `/opt/csw/bin/glib-compile-schemas /opt/csw/share/glib-2.0/schemas/`; then
+  exit 0
+else
+  if [ $zname != "global" ]; then
+     # in non-global zone this could fail because of no write  permissions
+     echo "Warning: Could not run '/opt/csw/bin/glib-compile-schemas /opt/csw/share/glib-2.0/schemas/' in non-global zone"
+     exit 0
+  else
+     # in global zone this has to work
+     exit 1
+  fi
+fi

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