* [gentoo-commits] proj/betagarden:master commit in: media-gfx/LightZone/files/, media-gfx/LightZone/
@ 2013-02-09 18:36 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2013-02-09 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 025b62817d907b5e14c6cd6c4afeb83287ee1112
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Feb 9 18:34:41 2013 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb 9 18:34:41 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=025b6281
media-gfx/LightZone: 3.9.1_p20130106
---
.../LightZone/LightZone-3.9.1_p20130106.ebuild | 104 ++++++++++++++++++++
.../files/LightZone-3.9.1_p20130106-char-bit.patch | 25 +++++
.../LightZone-3.9.1_p20130106-compile-flags.patch | 34 +++++++
.../LightZone-3.9.1_p20130106-crash-reports.patch | 25 +++++
...Zone-3.9.1_p20130106-fork-daemon-location.patch | 28 +++++
.../LightZone-3.9.1_p20130106-license-check.patch | 38 +++++++
.../files/LightZone-3.9.1_p20130106-machine.patch | 25 +++++
.../LightZone-3.9.1_p20130106-make-3.82.patch | 36 +++++++
.../LightZone-3.9.1_p20130106-mm-srai-epi64.patch | 24 +++++
.../LightZone-3.9.1_p20130106-os-reference.patch | 25 +++++
.../files/LightZone-3.9.1_p20130106-version.patch | 48 +++++++++
media-gfx/LightZone/metadata.xml | 8 ++
12 files changed, 420 insertions(+), 0 deletions(-)
diff --git a/media-gfx/LightZone/LightZone-3.9.1_p20130106.ebuild b/media-gfx/LightZone/LightZone-3.9.1_p20130106.ebuild
new file mode 100644
index 0000000..c32344e
--- /dev/null
+++ b/media-gfx/LightZone/LightZone-3.9.1_p20130106.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+JAVA_PKG_WANT_BUILD_VM="sun-jdk-1.6"
+JAVA_PKG_WANT_SOURCE="1.6"
+JAVA_PKG_WANT_TARGET="1.6"
+
+inherit multilib eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Digital darkroom software"
+HOMEPAGE="http://lightzoneproject.org/"
+SRC_URI="http://www.hartwork.org/public/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/javahelp
+ dev-java/sun-jai-bin"
+
+DEPEND="${COMMON_DEPEND}
+ dev-java/sun-jdk:1.6
+ app-text/htmltidy"
+RDEPEND="${COMMON_DEPEND}
+ || ( dev-java/sun-jdk:1.6 dev-java/sun-jre-bin:1.6 )"
+
+_make_empty_jar() {
+ local filename=${PWD}/$1
+
+ mkdir "${T}"/META-INF || die
+ ( cd "${T}" && jar cf "${filename}" META-INF/ ) || die
+ rmdir "${T}"/META-INF || die
+}
+
+src_prepare() {
+ rm -R macosx windows || die
+
+ epatch "${FILESDIR}"/${P}-*.patch
+
+ # Workaround: Ensure valid UTF-8 input
+ for i in \
+ lightcrafts/src/com/lightcrafts/jai/opimage/RGBDemosaicOpImage.java \
+ lightcrafts/src/com/lightcrafts/ui/toolkit/BoxedButton.java \
+ lightcrafts/src/com/lightcrafts/ui/toolkit/DropShadowPanel.java \
+ ; do
+ mv "${i}" "${i}".orig || die
+ iconv -f iso-8859-1 -t utf-8 "${i}".orig > "${i}" || die
+ done
+
+ einfo ''
+ einfo "Deleting shipped .so files:"
+ einfo "$(find . -name '*.so' -print -delete)"
+ einfo ''
+ einfo "Deleting bundled .jar files:"
+ einfo "$(find . -name '*.jar' -print | fgrep -v lightcrafts/lib/substance-lite.jar | xargs rm -v)"
+
+ ewarn ''
+ ewarn "These .jar files still need to be unbundled:"
+ ewarn "$(find . -name '*.jar' -print)"
+ ewarn ''
+
+ # Replace bundled files
+ ln -s /usr/$(get_libdir)/sun-jai-bin/libmlib_jai.so linux/lib/libmlib_jai.so || die
+ java-pkg_jar-from javahelp jh.jar linux/lib/jh.jar || die
+ java-pkg_jar-from sun-jai-bin mlibwrapper_jai.jar linux/lib/mlibwrapper_jai.jar || die
+ _make_empty_jar lightcrafts/lib/script-api.jar # Included in Sun Java 6 already
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ for i in linux lightcrafts; do
+ ( cd ${i} && eant ) || die
+ done
+}
+
+src_install() {
+ local so_file_dir_dolib=/usr/$(get_libdir)/${PN}
+ local so_file_dir=${so_file_dir_dolib}/$(get_libdir)
+
+ java-pkg_dojar $(find -type f -name '*.jar') || die
+
+ # Ensure our .so files are found
+ cat <<-EOF > "${T}"/launcher_prelude
+ export LD_LIBRARY_PATH='${so_file_dir}'
+ EOF
+
+ java-pkg_dolauncher \
+ ${PN} \
+ --main com.lightcrafts.platform.linux.LinuxLauncher \
+ --java_args "-Djava.library.path=${so_file_dir}" \
+ -pre "${T}"/launcher_prelude \
+ || die
+
+ dobin lightcrafts/products/LightZone-forkd || die
+
+ # NOTE: This one goes last so we don't have to call "into" again
+ into "${so_file_dir_dolib}"
+ dolib.so $(find -type f -name '*.so') || die
+}
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-char-bit.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-char-bit.patch
new file mode 100644
index 0000000..0d8e5c8
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-char-bit.patch
@@ -0,0 +1,25 @@
+From 4f58bfcffeba260f8a470d3f083b22c049f082c6 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 05:18:53 +0100
+Subject: [PATCH 5/6] Define CHAR_BIT
+
+---
+ lightcrafts/jnisrc/macstl/functional.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lightcrafts/jnisrc/macstl/functional.h b/lightcrafts/jnisrc/macstl/functional.h
+index c24ca1b..47ad2be 100644
+--- a/lightcrafts/jnisrc/macstl/functional.h
++++ b/lightcrafts/jnisrc/macstl/functional.h
+@@ -50,6 +50,8 @@ inline float log2 (float lhs) { return logf (lhs) / 0.693147180559945309417f; }
+ inline double log2 (double lhs) { return log (lhs) / 0.693147180559945309417; }
+ #endif
+
++#define CHAR_BIT 8
++
+ namespace stdext
+ {
+
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-compile-flags.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-compile-flags.patch
new file mode 100644
index 0000000..c21c642
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-compile-flags.patch
@@ -0,0 +1,34 @@
+From b7f0b11552145a1e038ee02520b2b4a6525d9d8a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 05:22:24 +0100
+Subject: [PATCH 6/6] Quickfix compile flags
+
+---
+ lightcrafts/mk/platform.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lightcrafts/mk/platform.mk b/lightcrafts/mk/platform.mk
+index f8700ce..4d1240e 100644
+--- a/lightcrafts/mk/platform.mk
++++ b/lightcrafts/mk/platform.mk
+@@ -167,7 +167,7 @@ else
+ #
+ # See Sun bug ID: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5102720
+ ##
+- P4_CPU_FLAGS:= -march=pentium4
++ P4_CPU_FLAGS:= -march=native
+
+ SSE_FLAGS_OFF:= $(P4_CPU_FLAGS) -mno-sse
+ SSE_FLAGS_ON:= $(P4_CPU_FLAGS) -msse2
+@@ -236,7 +236,7 @@ endif
+ # Linux
+ ##
+ ifeq ($(PLATFORM),Linux)
+- PLATFORM_CFLAGS+= -march=pentium3 -mtune=pentium4 $(SSE_FLAGS_ON) -fpermissive
++ PLATFORM_CFLAGS+= -march=native -fPIC
+ ifdef HIGH_PERFORMANCE
+ PLATFORM_CFLAGS+= -O3
+ else
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-crash-reports.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-crash-reports.patch
new file mode 100644
index 0000000..e2c4602
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-crash-reports.patch
@@ -0,0 +1,25 @@
+From 760de38c54c316bfae070be05c1f26818aa1bc18 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 18:08:33 +0100
+Subject: [PATCH] Turn crash report sending off by default
+
+---
+ lightcrafts/src/com/lightcrafts/app/ExceptionDialog.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lightcrafts/src/com/lightcrafts/app/ExceptionDialog.java b/lightcrafts/src/com/lightcrafts/app/ExceptionDialog.java
+index a4986ba..0c12f9d 100644
+--- a/lightcrafts/src/com/lightcrafts/app/ExceptionDialog.java
++++ b/lightcrafts/src/com/lightcrafts/app/ExceptionDialog.java
+@@ -77,7 +77,7 @@ public class ExceptionDialog extends JOptionPane {
+ group.add(exitButton);
+
+ sendBox = new JCheckBox(SendMessage);
+- sendBox.setSelected(true);
++ sendBox.setSelected(false);
+
+ JTextArea sendHelp = TextAreaFactory.createTextArea(SendHelp, 30);
+ sendHelp.setBackground((new JPanel()).getBackground());
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-fork-daemon-location.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-fork-daemon-location.patch
new file mode 100644
index 0000000..bd20913
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-fork-daemon-location.patch
@@ -0,0 +1,28 @@
+From 93b685f04fef070a105b5f496cbb7fdab6666d7a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 05:11:02 +0100
+Subject: [PATCH 1/6] Fix fork daemon location
+
+---
+ lightcrafts/src/com/lightcrafts/utils/ForkDaemon.java | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/lightcrafts/src/com/lightcrafts/utils/ForkDaemon.java b/lightcrafts/src/com/lightcrafts/utils/ForkDaemon.java
+index c0c5b0d..fb83cc3 100644
+--- a/lightcrafts/src/com/lightcrafts/utils/ForkDaemon.java
++++ b/lightcrafts/src/com/lightcrafts/utils/ForkDaemon.java
+@@ -113,10 +113,7 @@ public final class ForkDaemon {
+ private final InputStream stderr;
+
+ static {
+- String dir = System.getProperty( "install4j.appDir" );
+- if ( dir == null )
+- dir = ".";
+- FORKDAEMON_PATH = dir + File.separatorChar + FORKDAEMON_NAME;
++ FORKDAEMON_PATH = "/usr/bin/" + FORKDAEMON_NAME;
+ }
+
+ ////////// main() for testing /////////////////////////////////////////////
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-license-check.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-license-check.patch
new file mode 100644
index 0000000..3ea4198
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-license-check.patch
@@ -0,0 +1,38 @@
+From b439f7d70a22c5fa9486561678ae9a63fa49a494 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 05:12:57 +0100
+Subject: [PATCH] Bypass licensing check
+
+---
+ lightcrafts/src/com/lightcrafts/license/LicenseChecker.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/lightcrafts/src/com/lightcrafts/license/LicenseChecker.java b/lightcrafts/src/com/lightcrafts/license/LicenseChecker.java
+index d95a994..4b43f3f 100644
+--- a/lightcrafts/src/com/lightcrafts/license/LicenseChecker.java
++++ b/lightcrafts/src/com/lightcrafts/license/LicenseChecker.java
+@@ -28,6 +28,11 @@ public final class LicenseChecker {
+ final String licenseType =
+ System.getProperty( "com.lightcrafts.licensetype" );
+
++ if (true) {
++ /* bypass license check and display "" as licensing info */
++ return "";
++ }
++
+ LicenseCheckerModule licenseChecker = null;
+ if ( "ESD".equals( licenseType ) )
+ licenseChecker = new ESDLicenseCheckerModule();
+@@ -108,6 +113,9 @@ public final class LicenseChecker {
+ * @return Returns <code>true</code> if a valid license key was entered.
+ */
+ public static boolean license() {
++ if (true) {
++ return true; /* avoid exception "Can not license non-ESD." */
++ }
+ final String licenseType =
+ System.getProperty( "com.lightcrafts.licensetype" );
+ if ( !"ESD".equals( licenseType ) )
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-machine.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-machine.patch
new file mode 100644
index 0000000..b8f871e
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-machine.patch
@@ -0,0 +1,25 @@
+From ff50f91fa614c4284081081d4692f5aefe19993e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 05:13:55 +0100
+Subject: [PATCH 3/6] Fix machine detection
+
+---
+ lightcrafts/mk/platform.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lightcrafts/mk/platform.mk b/lightcrafts/mk/platform.mk
+index 33a4879..f8700ce 100644
+--- a/lightcrafts/mk/platform.mk
++++ b/lightcrafts/mk/platform.mk
+@@ -12,7 +12,7 @@ ifndef JAVA_HOME
+ $(error "JAVA_HOME" must be set)
+ endif
+
+-PROCESSOR:= $(shell uname -p)
++PROCESSOR:= $(shell uname -m)
+ TOOLS_BIN:= $(abspath $(ROOT)/lightcrafts/tools/bin)
+
+ # Default to a normal (Unix) classpath seperator.
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-make-3.82.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-make-3.82.patch
new file mode 100644
index 0000000..acb56e4
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-make-3.82.patch
@@ -0,0 +1,36 @@
+From 841fe73f58f58341fcadadc1c8d58e9c8d27d546 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 04:55:45 +0100
+Subject: [PATCH] Fix "mixed implicit and normal rules" with GNU make >=3.82
+
+---
+ lightcrafts/mk/recurse.mk | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lightcrafts/mk/recurse.mk b/lightcrafts/mk/recurse.mk
+index 9f0d43f..ce32153 100644
+--- a/lightcrafts/mk/recurse.mk
++++ b/lightcrafts/mk/recurse.mk
+@@ -20,7 +20,18 @@ endif
+ # overly verbose.
+
+ .PHONY: all
+-all %:
++all:
++ @for dir in $(SUBDIRS); \
++ do \
++ if [ -f $$dir/*akefile ]; \
++ then \
++ echo "-----> Entering $$dir"; \
++ $(MAKE) --no-print-directory -C $$dir $@ || exit 1; \
++ echo "-----> Leaving $$dir"; \
++ fi; \
++ done
++
++%:
+ @for dir in $(SUBDIRS); \
+ do \
+ if [ -f $$dir/*akefile ]; \
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-mm-srai-epi64.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-mm-srai-epi64.patch
new file mode 100644
index 0000000..86b9ec5
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-mm-srai-epi64.patch
@@ -0,0 +1,24 @@
+From d80ffc8a952cabdbbfccd3746eec7b9a267348b7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 05:18:12 +0100
+Subject: [PATCH 4/6] Stop using _mm_srai_epi64
+
+---
+ lightcrafts/jnisrc/macstl/impl/vec_mmx.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lightcrafts/jnisrc/macstl/impl/vec_mmx.h b/lightcrafts/jnisrc/macstl/impl/vec_mmx.h
+index d46b491..3b91bf2 100644
+--- a/lightcrafts/jnisrc/macstl/impl/vec_mmx.h
++++ b/lightcrafts/jnisrc/macstl/impl/vec_mmx.h
+@@ -2776,7 +2776,6 @@ template <> struct FN##_function <ARG1*, ARG2 > \
+
+ DEFINE_MMX_UNARY_FUNCTION_WITH_LITERAL (srai, _mm_srai_epi16, M128I_I16, M128I_I16)
+ DEFINE_MMX_UNARY_FUNCTION_WITH_LITERAL (srai, _mm_srai_epi32, M128I_I32, M128I_I32)
+- DEFINE_MMX_UNARY_FUNCTION_WITH_LITERAL (srai, _mm_srai_epi64, M128I_I64, M128I_I64)
+
+ DEFINE_MMX_BINARY_FUNCTION (srl, _mm_srl_epi16, M128I_I16, M128I_U16, M128I_I16)
+ DEFINE_MMX_BINARY_FUNCTION (srl, _mm_srl_epi16, M128I_U16, M128I_U16, M128I_U16)
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-os-reference.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-os-reference.patch
new file mode 100644
index 0000000..dec731d
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-os-reference.patch
@@ -0,0 +1,25 @@
+From 6c61e794050d28562647e7870b0f083c4df6c527 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 04:42:55 +0100
+Subject: [PATCH] Fix OS reference
+
+---
+ lightcrafts/build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lightcrafts/build.xml b/lightcrafts/build.xml
+index c8ff8b1..d26eed5 100644
+--- a/lightcrafts/build.xml
++++ b/lightcrafts/build.xml
+@@ -25,7 +25,7 @@
+ <!--===== Application build ==============================================-->
+
+ <condition property="jai-classpath"
+- value="../windows/lib/mlibwrapper_jai.jar">
++ value="../linux/lib/mlibwrapper_jai.jar">
+ <not>
+ <os family="mac"/>
+ </not>
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-version.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-version.patch
new file mode 100644
index 0000000..78819ea
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-version.patch
@@ -0,0 +1,48 @@
+From 9ba08836abd704dafd6f1defcb2623ac7376f3d6 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 9 Feb 2013 18:29:28 +0100
+Subject: [PATCH] Fix "(-1)" SVN revision in version string
+
+---
+ lightcrafts/src/com/lightcrafts/splash/SplashImage.java | 2 +-
+ linux/src/com/lightcrafts/platform/linux/LinuxLauncher.java | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lightcrafts/src/com/lightcrafts/splash/SplashImage.java b/lightcrafts/src/com/lightcrafts/splash/SplashImage.java
+index 9b544de..4e37f09 100644
+--- a/lightcrafts/src/com/lightcrafts/splash/SplashImage.java
++++ b/lightcrafts/src/com/lightcrafts/splash/SplashImage.java
+@@ -48,7 +48,7 @@ public final class SplashImage extends BufferedImage {
+ public static String[] getDefaultSplashText( String licenseText ) {
+ final String name = Version.getVersionName();
+ final int revision = Version.getRevisionNumber();
+- final String versionText = "Version " + name + " (" + revision + ')';
++ final String versionText = "Version " + name + " (ed3d11e5, 2013-01-06)";
+ if ( licenseText != null )
+ return new String[]{ versionText, licenseText };
+ return new String[]{ versionText };
+diff --git a/linux/src/com/lightcrafts/platform/linux/LinuxLauncher.java b/linux/src/com/lightcrafts/platform/linux/LinuxLauncher.java
+index 89e57e2..ba367fa 100644
+--- a/linux/src/com/lightcrafts/platform/linux/LinuxLauncher.java
++++ b/linux/src/com/lightcrafts/platform/linux/LinuxLauncher.java
+@@ -22,7 +22,7 @@ public final class LinuxLauncher {
+ "This is " +
+ Version.getApplicationName() + ' ' +
+ Version.getVersionName() + ' ' +
+- '(' + Version.getRevisionNumber() + ')'
++ "(ed3d11e5, 2013-01-06)"
+ );
+ if (! TestSSE2.hasSSE2()) {
+ TestSSE2.showDialog();
+@@ -37,7 +37,7 @@ public final class LinuxLauncher {
+
+ int revision = Version.getRevisionNumber();
+ String name = Version.getVersionName();
+- String versionText = "Version " + name + " (" + revision + ")";
++ String versionText = "Version " + name + " (ed3d11e5, 2013-01-06)";
+
+ String splashText = versionText;
+
+--
+1.8.1.2
+
diff --git a/media-gfx/LightZone/metadata.xml b/media-gfx/LightZone/metadata.xml
new file mode 100644
index 0000000..16bcc9f
--- /dev/null
+++ b/media-gfx/LightZone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>sping@gentoo.org</email>
+ <name>Sebastian Pipping</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: media-gfx/LightZone/files/, media-gfx/LightZone/
@ 2013-02-17 4:43 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2013-02-17 4:43 UTC (permalink / raw
To: gentoo-commits
commit: dae495d6fceb7ae0dacb78a324d0d83056516f3a
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Feb 17 03:53:55 2013 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 04:28:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=dae495d6
media-gfx/LightZone: 3.9.1_p20130106-r2
---
....ebuild => LightZone-3.9.1_p20130106-r2.ebuild} | 15 ++---
.../LightZone-3.9.1_p20130106-indent-number.patch | 61 ++++++++++++++++++++
2 files changed, 67 insertions(+), 9 deletions(-)
diff --git a/media-gfx/LightZone/LightZone-3.9.1_p20130106-r1.ebuild b/media-gfx/LightZone/LightZone-3.9.1_p20130106-r2.ebuild
similarity index 88%
rename from media-gfx/LightZone/LightZone-3.9.1_p20130106-r1.ebuild
rename to media-gfx/LightZone/LightZone-3.9.1_p20130106-r2.ebuild
index bc84023..171270a 100644
--- a/media-gfx/LightZone/LightZone-3.9.1_p20130106-r1.ebuild
+++ b/media-gfx/LightZone/LightZone-3.9.1_p20130106-r2.ebuild
@@ -19,8 +19,9 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-COMMON_DEPEND="dev-java/javahelp
- dev-java/sun-jai-bin"
+COMMON_DEPEND="dev-java/javahelp:0
+ dev-java/sun-jai-bin:0
+ dev-java/substance:3.3"
DEPEND="${COMMON_DEPEND}
dev-java/sun-jdk:1.6
@@ -53,21 +54,17 @@ src_prepare() {
einfo ''
einfo "Deleting shipped .so files:"
- einfo "$(find . -name '*.so' -print -delete)"
+ einfo "$(find . -name '*.so' -print -delete | sort)"
einfo ''
einfo "Deleting bundled .jar files:"
- einfo "$(find . -name '*.jar' -print | fgrep -v lightcrafts/lib/substance-lite.jar | xargs rm -v)"
-
- ewarn ''
- ewarn "These .jar files still need to be unbundled:"
- ewarn "$(find . -name '*.jar' -print)"
- ewarn ''
+ einfo "$(find . -name '*.jar' -print -delete | sort)"
# Replace bundled files
ln -s /usr/$(get_libdir)/sun-jai-bin/libmlib_jai.so linux/lib/libmlib_jai.so || die
java-pkg_jar-from javahelp jh.jar linux/lib/jh.jar || die
java-pkg_jar-from sun-jai-bin mlibwrapper_jai.jar linux/lib/mlibwrapper_jai.jar || die
_make_empty_jar lightcrafts/lib/script-api.jar # Included in Sun Java 6 already
+ java-pkg_jar-from substance-3.3 substance-lite.jar lightcrafts/lib/substance-lite.jar || die
java-pkg-2_src_prepare
}
diff --git a/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-indent-number.patch b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-indent-number.patch
new file mode 100644
index 0000000..e747684
--- /dev/null
+++ b/media-gfx/LightZone/files/LightZone-3.9.1_p20130106-indent-number.patch
@@ -0,0 +1,61 @@
+From 0355c092ce86a25110a8b91df0a45b92e5730fe7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 17 Feb 2013 05:08:17 +0100
+Subject: [PATCH] Handle "Not supported: indent-number" exception
+
+---
+ lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java | 6 +++++-
+ lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java b/lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java
+index a7ed7fe..ac5c406 100644
+--- a/lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java
++++ b/lightcrafts/src/com/lightcrafts/utils/xml/XMLUtil.java
+@@ -3,6 +3,7 @@
+ package com.lightcrafts.utils.xml;
+
+ import java.io.*;
++import java.lang.IllegalArgumentException;
+ import java.util.ArrayList;
+
+ import javax.xml.parsers.DocumentBuilder;
+@@ -435,7 +436,10 @@ public final class XMLUtil {
+ catch ( Exception e ) {
+ throw new IllegalStateException( e );
+ }
+- m_xformFactory.setAttribute( "indent-number", "2" );
++ try {
++ m_xformFactory.setAttribute( "indent-number", "2" );
++ } catch ( IllegalArgumentException e ) {
++ }
+ }
+ }
+ /* vim:set et sw=4 ts=4: */
+diff --git a/lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java b/lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java
+index e7f69a7..407ca17 100644
+--- a/lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java
++++ b/lightcrafts/src/com/lightcrafts/utils/xml/XmlDocument.java
+@@ -14,6 +14,7 @@ import javax.xml.transform.dom.DOMSource;
+ import javax.xml.transform.stream.StreamResult;
+ import javax.xml.transform.stream.StreamSource;
+ import java.io.*;
++import java.lang.IllegalArgumentException;
+ import java.util.Arrays;
+
+ /**
+@@ -50,7 +51,10 @@ public class XmlDocument {
+ Transformers = TransformerFactory.newInstance();
+ // Here's how one controls XML output indentation in Java 1.5:
+ if (System.getProperty("java.version").startsWith("1.5")) {
+- Transformers.setAttribute("indent-number", "2");
++ try {
++ Transformers.setAttribute("indent-number", "2");
++ } catch (IllegalArgumentException e) {
++ }
+ }
+ }
+ catch (TransformerFactoryConfigurationError e) {
+--
+1.8.1.2
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-17 4:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-09 18:36 [gentoo-commits] proj/betagarden:master commit in: media-gfx/LightZone/files/, media-gfx/LightZone/ Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2013-02-17 4:43 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox