Date: Thursday, April 16, 2015 @ 12:04:45
Author: guillaume
Revision: 237237
IcedTea upstream release and removed giflib patch
Modified:
java7-openjdk/trunk/PKGBUILD
Deleted:
java7-openjdk/trunk/giflib_5.1.diff
-----------------+
PKGBUILD | 29 +++++++++++++----------------
giflib_5.1.diff | 14 --------------
2 files changed, 13 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-04-16 09:32:30 UTC (rev 237236)
+++ PKGBUILD 2015-04-16 10:04:45 UTC (rev 237237)
@@ -6,13 +6,13 @@
pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src'
'openjdk7-doc')
pkgbase=java7-openjdk
_java_ver=7
-_icedtea_ver=2.5.4
+_icedtea_ver=2.5.5
#pkgver() {
# _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+"
${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
# | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
# echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
#}
-_updatever=75
+_updatever=79
pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
pkgrel=1
@@ -38,20 +38,18 @@
icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
fontconfig-paths.diff
- openjdk7_nonreparenting-wm.diff
- giflib_5.1.diff)
+ openjdk7_nonreparenting-wm.diff)
-sha256sums=('5301b9a8592af2cf8e3e7a3650e5e1fe744c6d2de7f8ff78080b2eeae86a9800'
- '88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1'
- '7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b'
- '84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3'
- '4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b'
- 'e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09'
- '4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a'
- '4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34'
+sha256sums=('f05b1db06021f4cd3a39647f358a47130136d189431fb55f79855f627b1d6619'
+ '5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d'
+ 'f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51'
+ '293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256'
+ '76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be'
+ 'c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483'
+ '71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660'
+ 'd724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
- '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
- '77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9')
+ '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -81,8 +79,7 @@
cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
- patches/openjdk7_nonreparenting-wm.diff \
- patches/giflib_5.1.diff"
+ patches/openjdk7_nonreparenting-wm.diff"
if [ "$_bootstrap" = "1" ]; then
BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
Deleted: giflib_5.1.diff
===================================================================
--- giflib_5.1.diff 2015-04-16 09:32:30 UTC (rev 237236)
+++ giflib_5.1.diff 2015-04-16 10:04:45 UTC (rev 237237)
@@ -1,14 +0,0 @@
---- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.orig
2014-05-27 22:17:19.766866065 +0200
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
2014-05-27 22:16:35.452894426 +0200
-@@ -310,7 +310,11 @@
- free(pBitmapBits);
- free(pOldBitmapBits);
-
-+#if GIFLIB_MAJOR >= 5
-+ DGifCloseFile(gif, NULL);
-+#else
- DGifCloseFile(gif);
-+#endif
-
- return 1;
- }
