[120293] trunk/dports/aqua/tagainijisho

ryandesign at macports.org ryandesign at macports.org
Wed May 21 17:26:09 PDT 2014


Revision: 120293
          https://trac.macports.org/changeset/120293
Author:   ryandesign at macports.org
Date:     2014-05-21 17:26:08 -0700 (Wed, 21 May 2014)
Log Message:
-----------
tagainijisho: update to 1.0.2 (#43736; maintainer timeout)

Modified Paths:
--------------
    trunk/dports/aqua/tagainijisho/Portfile
    trunk/dports/aqua/tagainijisho/files/patch-CMakeLists.txt.diff
    trunk/dports/aqua/tagainijisho/files/patch-pack-CMakeLists.txt.diff

Added Paths:
-----------
    trunk/dports/aqua/tagainijisho/files/patch-i18n-CMakeLists.txt.diff

Modified: trunk/dports/aqua/tagainijisho/Portfile
===================================================================
--- trunk/dports/aqua/tagainijisho/Portfile	2014-05-22 00:21:50 UTC (rev 120292)
+++ trunk/dports/aqua/tagainijisho/Portfile	2014-05-22 00:26:08 UTC (rev 120293)
@@ -5,7 +5,7 @@
 PortGroup           github 1.0
 PortGroup           cmake 1.0
 
-github.setup        Gnurou tagainijisho 0.9.4
+github.setup        Gnurou tagainijisho 1.0.2
 license             GPL-3+
 categories          aqua education japanese
 platforms           darwin
@@ -27,14 +27,15 @@
                     or printing them on a small booklet.
 
 homepage            http://www.tagaini.net/
-master_sites        http://cloud.github.com/downloads/Gnurou/${name}/
+github.tarball_from releases
 
-checksums           rmd160  0693e567da51f15bee8399ba312b20b4076ff84e \
-                    sha256  61b840d1252c459d1130c24dfa7883b50ced513e076cf31388c88ab5eca4f0e0
+checksums           rmd160  a47a9702d71bd154aeaea06d3234d9e4ef75d8d4 \
+                    sha256  144a516a69d440014269dd2a11e10760fd9543726affd9af152b28e1e1d57c3f
 
 depends_lib         port:qt4-mac
 
 patchfiles          patch-CMakeLists.txt.diff \
+                    patch-i18n-CMakeLists.txt.diff \
                     patch-pack-CMakeLists.txt.diff
 
 configure.pre_args  -DCMAKE_INSTALL_PREFIX=${applications_dir}

Modified: trunk/dports/aqua/tagainijisho/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/aqua/tagainijisho/files/patch-CMakeLists.txt.diff	2014-05-22 00:21:50 UTC (rev 120292)
+++ trunk/dports/aqua/tagainijisho/files/patch-CMakeLists.txt.diff	2014-05-22 00:26:08 UTC (rev 120293)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2012-05-10 17:42:15.000000000 -0500
-+++ CMakeLists.txt	2012-08-27 20:00:35.000000000 -0500
+--- CMakeLists.txt.orig	2014-04-13 22:16:06.000000000 -0500
++++ CMakeLists.txt	2014-05-16 19:32:25.000000000 -0500
 @@ -30,8 +30,6 @@
  # 64 bits Intel binary with 10.6 compatibility 
  if(APPLE)
  	set(CMAKE_OSX_ARCHITECTURES "${ARCHS_STANDARD_64_BIT}")
--	set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk")
+-	set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk")
 -	set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
  	set(CMAKE_PREFIX_PATH "${CMAKE_OSX_SYSROOT}/usr")  
  	set(CMAKE_FRAMEWORK_PATH "${CMAKE_OSX_SYSROOT}/Library/Frameworks:${CMAKE_OSX_SYSROOT}/System/")
- 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -sectcreate __TEXT __info_plist ${CMAKE_BINARY_DIR}/src/gui/Tagaini\\ Jisho.app/Contents/Info.plist")
+ 	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/pack/MacOS/")

Added: trunk/dports/aqua/tagainijisho/files/patch-i18n-CMakeLists.txt.diff
===================================================================
--- trunk/dports/aqua/tagainijisho/files/patch-i18n-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/aqua/tagainijisho/files/patch-i18n-CMakeLists.txt.diff	2014-05-22 00:26:08 UTC (rev 120293)
@@ -0,0 +1,14 @@
+Fixes destroot failure when path to source code contains underscore
+due to overly greedy regular expression:
+https://github.com/Gnurou/tagainijisho/issues/103
+--- i18n/CMakeLists.txt.orig	2014-04-13 22:16:06.000000000 -0500
++++ i18n/CMakeLists.txt	2014-05-16 20:42:09.000000000 -0500
+@@ -11,7 +11,7 @@
+ 
+ set(UI_LANG "")
+ foreach(tsfile ${TRANSLATIONS_FILES})
+-	string(REGEX REPLACE "[^_]*_(.*)\\.ts" "\\1" rmatch ${tsfile})
++	string(REGEX REPLACE "^.+/tagainijisho_([^/]+)\\.ts$" "\\1" rmatch ${tsfile})
+ 	set(UI_LANG "${UI_LANG};${rmatch}")
+ endforeach(tsfile ${TRANSLATIONS_FILES})
+ 

Modified: trunk/dports/aqua/tagainijisho/files/patch-pack-CMakeLists.txt.diff
===================================================================
--- trunk/dports/aqua/tagainijisho/files/patch-pack-CMakeLists.txt.diff	2014-05-22 00:21:50 UTC (rev 120292)
+++ trunk/dports/aqua/tagainijisho/files/patch-pack-CMakeLists.txt.diff	2014-05-22 00:26:08 UTC (rev 120293)
@@ -1,6 +1,15 @@
---- pack/CMakeLists.txt.orig	2011-11-17 16:21:18.000000000 +0100
-+++ pack/CMakeLists.txt	2011-11-19 17:52:15.000000000 +0100
-@@ -72,7 +72,7 @@
+First part fixes destroot failure because of ignoring DESTDIR:
+https://github.com/Gnurou/tagainijisho/issues/104
+--- pack/CMakeLists.txt.orig	2014-04-13 22:16:06.000000000 -0500
++++ pack/CMakeLists.txt	2014-05-16 20:02:11.000000000 -0500
+@@ -67,13 +67,13 @@
+ 		endforeach(LANG ${UI_LANG})
+ 	
+ 		# Qt config
+-		install(CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DIR}/qt.conf\" \"[Paths]\nPlugins = PlugIns\nTranslations = Translations\n\")" COMPONENT Runtime)
++		install(CODE "file(WRITE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DIR}/qt.conf\" \"[Paths]\nPlugins = PlugIns\nTranslations = Translations\n\")" COMPONENT Runtime)
+ 		
+ 		# Qt plugins
  		install(CODE "
  			file(GLOB_RECURSE QTPLUGINS \"\${CMAKE_INSTALL_PREFIX}/${EXE_DIR}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
  		include(BundleUtilities)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140521/dd900de3/attachment.html>


More information about the macports-changes mailing list