[133897] trunk/dports/aqua/djview
nicos at macports.org
nicos at macports.org
Sun Mar 15 03:42:22 PDT 2015
Revision: 133897
https://trac.macports.org/changeset/133897
Author: nicos at macports.org
Date: 2015-03-15 03:42:21 -0700 (Sun, 15 Mar 2015)
Log Message:
-----------
djview: update to 4.10 (ticket #47155)
Modified Paths:
--------------
trunk/dports/aqua/djview/Portfile
Added Paths:
-----------
trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff
trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff
Removed Paths:
-------------
trunk/dports/aqua/djview/files/patch-djview.cpp.diff
Modified: trunk/dports/aqua/djview/Portfile
===================================================================
--- trunk/dports/aqua/djview/Portfile 2015-03-15 06:47:04 UTC (rev 133896)
+++ trunk/dports/aqua/djview/Portfile 2015-03-15 10:42:21 UTC (rev 133897)
@@ -5,8 +5,7 @@
PortGroup qt4 1.0
name djview
-version 4.9
-revision 1
+version 4.10
categories aqua graphics www
license GPL-2+ MIT
maintainers nicos openmaintainer
@@ -19,19 +18,16 @@
looks nicer on a screen and consume less client resources than competing \
formats.
-homepage http://djvu.sourceforge.net/
+homepage http://djvu.sourceforge.net/djview4.html
master_sites sourceforge:djvu
-#Patch to suppress use of translations in code, as English cannot be obtained
-#otherwise (ticket #36210)
-patchfiles patch-djview.cpp.diff
+patchfiles patch-makefile-target-fix.diff \
+ patch-makefile-qmake-workaround.diff
-checksums rmd160 c0d6b33767096ee9f1aeee3f3bf82b0dc10b5b42 \
- sha256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c
+checksums rmd160 859dcdbfd43ecf7506786f5658ca12ce6041d83d \
+ sha256 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f
-worksrcdir ${name}4-${version}
-
depends_lib-append \
port:djvulibre
@@ -43,19 +39,6 @@
--disable-desktopfiles \
QMAKESPEC=${qt_mkspecs_dir}/macx-g++
-# when Qt is installed without +universal, and qmake is called with
-# "QMAKE_LDFLAGS += -arch foo", and "foo" is the native arch, then, at
-# least sometimes, qmake will erroneously remove the second "foo" but
-# leave the "-arch" flag -- generating an error at linking. Not sure
-# if this is the case with +debug; does not matter for this port,
-# since it has not debug variant.
-post-configure {
- if {![variant_isset universal]} {
- reinplace "s|\\(-arch ${build_arch}\\) -arch|\\1|" \
- ${worksrcpath}/src/Makefile
- }
-}
-
# allow ccache, if specified by the user
pre-build {
if {[tbool configure.ccache]} {
Deleted: trunk/dports/aqua/djview/files/patch-djview.cpp.diff
===================================================================
--- trunk/dports/aqua/djview/files/patch-djview.cpp.diff 2015-03-15 06:47:04 UTC (rev 133896)
+++ trunk/dports/aqua/djview/files/patch-djview.cpp.diff 2015-03-15 10:42:21 UTC (rev 133897)
@@ -1,14 +0,0 @@
---- src/djview.cpp.orig 2012-04-10 12:56:55.000000000 +0900
-+++ src/djview.cpp 2012-09-24 10:36:22.000000000 +0900
-@@ -242,9 +242,9 @@
- if (qdir.exists())
- if (trans->load(name + "_" + lang, dir, "_.-"))
- return true;
-- if (lang.startsWith("en_") || lang == "en" || lang == "c")
-- break;
- }
-+ if (lang.startsWith("en_") || lang == "en" || lang == "c")
-+ break;
- }
- return false;
- }
Added: trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff
===================================================================
--- trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff (rev 0)
+++ trunk/dports/aqua/djview/files/patch-makefile-qmake-workaround.diff 2015-03-15 10:42:21 UTC (rev 133897)
@@ -0,0 +1,31 @@
+# Work around a qmake bug where, in some cases, it will add an
+# extraneous '-arch' flag. In other ports (and in previous versions of
+# this one), this was handled with reinplace in the post-configure
+# step. Unfortunately, Makefile.qmake doesn't exist at post-configure
+# so this patch modifies the Makefile rule which creates
+# Makefile.qmake to remove the '-arch' flag.
+
+--- src/Makefile.am.orig 2015-03-14 13:56:11.000000000 -0400
++++ src/Makefile.am 2015-03-14 14:26:15.000000000 -0400
+@@ -68,7 +68,8 @@
+ QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \
+ LIBS+='$(QMAKELIBS)' \
+ VPATH='$(srcdir)' -o - djview.pro |\
+- $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@
++ $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\
++ $(SED) 's/-arch *-/-/g' > $@
+
+ # cleaning
+
+--- src/Makefile.in.orig 2015-03-14 13:56:20.000000000 -0400
++++ src/Makefile.in 2015-03-14 14:26:46.000000000 -0400
+@@ -677,7 +677,8 @@
+ QMAKE_CPPFLAGS+='$(CPPFLAGS) $(qmake_allflags)' \
+ LIBS+='$(QMAKELIBS)' \
+ VPATH='$(srcdir)' -o - djview.pro |\
+- $(AWK) -f $(top_srcdir)/config/qmsilent.awk > $@
++ $(AWK) -f $(top_srcdir)/config/qmsilent.awk |\
++ $(SED) 's/-arch *-/-/g' > $@
+
+ # cleaning
+
Added: trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff
===================================================================
--- trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff (rev 0)
+++ trunk/dports/aqua/djview/files/patch-makefile-target-fix.diff 2015-03-15 10:42:21 UTC (rev 133897)
@@ -0,0 +1,22 @@
+--- src/Makefile.am.orig 2015-03-14 13:56:11.000000000 -0400
++++ src/Makefile.am 2015-03-14 13:52:37.000000000 -0400
+@@ -12,7 +12,7 @@
+ bin_SCRIPTS = djview
+
+ djview: Makefile.qmake FORCE
+- ${MAKE} -f Makefile.qmake djview
++ ${MAKE} -f Makefile.qmake
+
+ FORCE:
+
+--- src/Makefile.in.orig 2015-03-14 13:56:20.000000000 -0400
++++ src/Makefile.in 2015-03-14 13:53:29.000000000 -0400
+@@ -649,7 +649,7 @@
+ $(AWK) -f $(top_srcdir)/config/qmsources.awk < $< > $@
+
+ djview: Makefile.qmake FORCE
+- ${MAKE} -f Makefile.qmake djview
++ ${MAKE} -f Makefile.qmake
+
+ FORCE:
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150315/cb3e4c07/attachment.html>
More information about the macports-changes
mailing list