diff options
author | Andrejs Mivreņiks | 2015-08-24 12:15:58 +0300 |
---|---|---|
committer | Andrejs Mivreņiks | 2015-08-24 12:15:58 +0300 |
commit | c32bb3c6569a751b62c46345f7bcb4a9452f1c34 (patch) | |
tree | 7992057d589c86293b16accb58e4284e65db0959 | |
parent | d15e50b64f4b3065d1623791c5d88b35f2087a98 (diff) | |
download | aur-c32bb3c6569a751b62c46345f7bcb4a9452f1c34.tar.gz |
Fix patching issue
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | 004_add-fontconfig.patch | 10 | ||||
-rw-r--r-- | PKGBUILD | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -33,7 +33,7 @@ pkgbase = java8-openjdk sha256sums = cb854984714541af5cba6e920958d0c68f2de52bff5acf723387fa03d63d8c3d sha256sums = 93a553f2e9dfc820e50bfd70f989c96cd330857849ddba23dc50246e99ab1329 sha256sums = 518dd422df787547bbeedb57a524501548a6efd8f96443ebc59276cc7922e801 - sha256sums = 7eccdeda71d651423a066c942b3d300eccd8d95e161725fa508d84f0bc010ceb + sha256sums = 3e67013b249fe702b0176e5d39f7ddef85ef0df121ef0b3a898ea82772712f55 sha256sums = efeee8db0710bc217b5e886224450f6cf50938004e8c140eb9aee0a699d2d5ac pkgname = jre8-openjdk-headless-infinality diff --git a/004_add-fontconfig.patch b/004_add-fontconfig.patch index da25036b9a24..9fc8a005fb7c 100644 --- a/004_add-fontconfig.patch +++ b/004_add-fontconfig.patch @@ -1,12 +1,12 @@ diff -rupN a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk ---- a/make/lib/Awt2dLibraries.gmk 2014-09-14 18:57:10.466023148 +0200 -+++ b/make/lib/Awt2dLibraries.gmk 2014-09-14 18:58:11.888148006 +0200 -@@ -827,7 +827,7 @@ $(eval $(call SetupNativeCompilation,BUI +--- a/make/lib/Awt2dLibraries.gmk 2015-07-13 20:50:59.000000000 +0300 ++++ b/make/lib/Awt2dLibraries.gmk 2015-08-24 12:12:22.930330643 +0300 +@@ -824,7 +824,7 @@ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \ - LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ + LDFLAGS_SUFFIX_linux := -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ - LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ - LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\ + LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ + LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\ LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ @@ -43,7 +43,7 @@ sha256sums=('97e368187b08067d57eb10bce08fb9057e63242c263f63ab7b7dd036cbf7aebf' 'cb854984714541af5cba6e920958d0c68f2de52bff5acf723387fa03d63d8c3d' '93a553f2e9dfc820e50bfd70f989c96cd330857849ddba23dc50246e99ab1329' '518dd422df787547bbeedb57a524501548a6efd8f96443ebc59276cc7922e801' - '7eccdeda71d651423a066c942b3d300eccd8d95e161725fa508d84f0bc010ceb' + '3e67013b249fe702b0176e5d39f7ddef85ef0df121ef0b3a898ea82772712f55' 'efeee8db0710bc217b5e886224450f6cf50938004e8c140eb9aee0a699d2d5ac') case "${CARCH}" in |