diff --git a/programming/language/java/java7-openjdk/actions.py b/programming/language/java/java7-openjdk/actions.py index 512cfb426b..5ed8fad8cc 100755 --- a/programming/language/java/java7-openjdk/actions.py +++ b/programming/language/java/java7-openjdk/actions.py @@ -15,8 +15,8 @@ shelltools.export("LC_ALL", "C") def setup(): shelltools.system('export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \ - patches/openjdk7_nonreparenting-wm.diff\ - patches/giflib_5.1.diff"') + patches/openjdk7_nonreparenting-wm.diff"') + #patches/giflib_5.1.diff autotools.rawConfigure("\ --disable-tests \ @@ -24,14 +24,13 @@ def setup(): --with-parallel-jobs=%s \ --enable-nss \ --with-rhino \ - --bindir=/usr/bin \ --disable-system-kerberos \ --disable-system-pcsc \ --disable-system-sctp \ --enable-bootstrap \ --with-ecj-jar=/usr/share/java/ecj.jar \ --with-jdk-home=/usr/lib/jvm/java-7-openjdk \ - --with-pkgversion='PisiLinux build 7u_181.2.6.14' \ + --with-pkgversion='PisiLinux build 7.u181_2.6.14' \ " % get.makeJOBS().replace("-j", "")) def build(): diff --git a/programming/language/java/java7-openjdk/pspec.xml b/programming/language/java/java7-openjdk/pspec.xml index 1c6ed4e008..f00449957f 100755 --- a/programming/language/java/java7-openjdk/pspec.xml +++ b/programming/language/java/java7-openjdk/pspec.xml @@ -42,7 +42,7 @@ - giflib_5.1.diff + fontconfig-paths.diff openjdk7_nonreparenting-wm.diff