diff options
author | Oleg Shparber | 2015-04-21 13:03:28 -0700 |
---|---|---|
committer | Oleg Shparber | 2015-04-21 13:03:28 -0700 |
commit | a62d8d394ec4e4d8f9eb3e02f9b24b70f43d33f2 (patch) | |
tree | 19a1d63e96b3546e08318c08b9234f497ee12e73 | |
parent | 3c585a638e453a821ce12190921b685b8016bcbf (diff) | |
download | aur-a62d8d394ec4e4d8f9eb3e02f9b24b70f43d33f2.tar.gz |
java7-openjdk-infinality: Remove giflib patch
ABS Change: d7626e60d4480af1d8cd94cf14e319cdc6dcfd0f
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | giflib_5.1.diff | 14 |
3 files changed, 3 insertions, 22 deletions
@@ -39,7 +39,6 @@ pkgbase = java7-openjdk source = icedtea_2.5.4_hotspot.tar.bz2::http://icedtea.classpath.org/download/drops/icedtea7/2.5.4/hotspot.tar.bz2 source = fontconfig-paths.diff source = openjdk7_nonreparenting-wm.diff - source = giflib_5.1.diff sha256sums = 5301b9a8592af2cf8e3e7a3650e5e1fe744c6d2de7f8ff78080b2eeae86a9800 sha256sums = 88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1 sha256sums = 7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b @@ -50,7 +49,6 @@ pkgbase = java7-openjdk sha256sums = 4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34 sha256sums = 9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f sha256sums = 56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b - sha256sums = 77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9 pkgname = jre7-openjdk-headless-infinality pkgdesc = OpenJDK Java 7 headless runtime environment @@ -35,8 +35,7 @@ source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz 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' @@ -47,8 +46,7 @@ sha256sums=('5301b9a8592af2cf8e3e7a3650e5e1fe744c6d2de7f8ff78080b2eeae86a9800' '4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a' '4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b' - '77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9') + '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b') noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2 icedtea_${_icedtea_ver}_corba.tar.bz2 @@ -78,8 +76,7 @@ build() { 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" diff --git a/giflib_5.1.diff b/giflib_5.1.diff deleted file mode 100644 index a9361573cf69..000000000000 --- a/giflib_5.1.diff +++ /dev/null @@ -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; - } |