From ec67702333829fd856cf9ff327fc29692cf4be97 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sat, 14 Apr 2012 09:44:16 -0500 Subject: [PATCH] net-p2p/freenet: 1407 changed patch context; updated --- net-p2p/freenet/Manifest | 3 ++- ...5_p1407-libraryloader-just-try-loading.patch | 17 +++++++++++++++++ net-p2p/freenet/freenet-0.7.5_p1407.ebuild | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 net-p2p/freenet/files/freenet-0.7.5_p1407-libraryloader-just-try-loading.patch diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest index b83e45b..a7d32c0 100644 --- a/net-p2p/freenet/Manifest +++ b/net-p2p/freenet/Manifest @@ -4,6 +4,7 @@ AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27 AUX freenet-0.7.5_p1384-libraryloader-just-try-loading.patch 833 RMD160 eec3bec210ec4389e2f446d021238024ff854e0f SHA1 96dd2400bdb5e4489816b750898613483f0ae44f SHA256 ea583fd3893240c9e28b0e0ab652902b7b2819686f06beb17995bd591fe1b36e AUX freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch 932 RMD160 816bd5e83c8edfef277b70db431cf16247e796fb SHA1 d7758412ebf8cf820cb643a9f7ed71376a17d307 SHA256 1bb91a57f71044ee3dd51bb07eb7523644b60232445757c28a19b48a56a95e0a AUX freenet-0.7.5_p1389-wrapper.conf 1680 RMD160 bcb6122d7b9960e75d850765b005e521f521e47a SHA1 cfe240aa8b43f39c0e4a3f38485fd82245f9cd17 SHA256 f9e8e37b4e7eacbd5534fabce20a6597ae8123b4c63267393ed0d593a2c79a82 +AUX freenet-0.7.5_p1407-libraryloader-just-try-loading.patch 849 RMD160 860501d5241dba7f4dfc7ebe4c334f81cf840cbf SHA1 984554c17ffd3677556638b8a11d5859960b07b3 SHA256 6c7245e8634df01c0c53de20248126a2559675fd2d28bce16a8d36d7e23ffebc AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0ab062d46f494db88560885d7ee7b026e29 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6 AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 123fb5cf1c9b50357156fa300c5015a7e0ca65ad SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a AUX strip-openjdk-check.patch 4015 RMD160 c512338ac1dc9ca88082f403d8a4bc4dfcb98c07 SHA1 8e2e7c6eb7bb0f738d9afd73b2b32f7f5b2d515b SHA256 74f4d18e590b181d60ee41c1d3aa9ede8525fd643cdfa4e4688d1c8310ec893c @@ -25,7 +26,7 @@ EBUILD freenet-0.7.5_p1403.ebuild 4722 RMD160 b5faff4a48cd2b5e5bfc8608b3f1f7a2ab EBUILD freenet-0.7.5_p1404.ebuild 4722 RMD160 b5faff4a48cd2b5e5bfc8608b3f1f7a2ab79e35a SHA1 cccae857c80282f5878420f33ae9d596afecfd27 SHA256 34a628dbe1a8cde652bfa5e4adc709322c3bd9235306fa7da21f3f475ace86c1 EBUILD freenet-0.7.5_p1405.ebuild 4722 RMD160 b5faff4a48cd2b5e5bfc8608b3f1f7a2ab79e35a SHA1 cccae857c80282f5878420f33ae9d596afecfd27 SHA256 34a628dbe1a8cde652bfa5e4adc709322c3bd9235306fa7da21f3f475ace86c1 EBUILD freenet-0.7.5_p1406.ebuild 4722 RMD160 63c246077e1be61a6328882c191769fc097abad4 SHA1 5938795055036739f4a6cc57be1893fdca422183 SHA256 1588785a3a6b1c30cca7d7d8a850b0156489e8595d9eb1c1b1f96898200ba666 -EBUILD freenet-0.7.5_p1407.ebuild 4722 RMD160 63c246077e1be61a6328882c191769fc097abad4 SHA1 5938795055036739f4a6cc57be1893fdca422183 SHA256 1588785a3a6b1c30cca7d7d8a850b0156489e8595d9eb1c1b1f96898200ba666 +EBUILD freenet-0.7.5_p1407.ebuild 4722 RMD160 d38a0c2bacd58e869917992b29231df1b3505a2d SHA1 7bbd48524641887a29b736347a3c670b44a94edc SHA256 20cdd8b90373e3419e318083528cebd0b0f3c855ea9a48ecf4e83f719d2cef00 MISC freenet-0.7.5_p1400.reason 24 RMD160 5a1fc3970cf9ad6155dd62b5bea547a2f2f195d2 SHA1 c6c8455725ba6c521a73e52fc600bb1f3b845d9b SHA256 ca238b3efe94b6e3a128e43d55dbe66cdeabab6ec89655cc9e9a1735dcbec7b8 MISC freenet-0.7.5_p1401.reason 24 RMD160 5a1fc3970cf9ad6155dd62b5bea547a2f2f195d2 SHA1 c6c8455725ba6c521a73e52fc600bb1f3b845d9b SHA256 ca238b3efe94b6e3a128e43d55dbe66cdeabab6ec89655cc9e9a1735dcbec7b8 MISC freenet-0.7.5_p1403.reason 24 RMD160 5a1fc3970cf9ad6155dd62b5bea547a2f2f195d2 SHA1 c6c8455725ba6c521a73e52fc600bb1f3b845d9b SHA256 ca238b3efe94b6e3a128e43d55dbe66cdeabab6ec89655cc9e9a1735dcbec7b8 diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1407-libraryloader-just-try-loading.patch b/net-p2p/freenet/files/freenet-0.7.5_p1407-libraryloader-just-try-loading.patch new file mode 100644 index 0000000..4a409cb --- /dev/null +++ b/net-p2p/freenet/files/freenet-0.7.5_p1407-libraryloader-just-try-loading.patch @@ -0,0 +1,17 @@ +--- freenet-0.7.5_p1384/src/freenet/support/LibraryLoader.java.orig 2011-07-29 17:32:37.000000000 +0200 ++++ freenet-0.7.5_p1384/src/freenet/support/LibraryLoader.java 2011-07-29 17:35:02.000000000 +0200 +@@ -48,12 +48,11 @@ + final String libraryNameWithPrefixAndArchAndSuffix = libraryNameWithPrefixAndArch + prefix; + String resourceName = path + libraryNameWithPrefixAndArchAndSuffix; + +- File nativeLib = new File((System.getProperty("java.library.path")) + "/lib" + libraryName + prefix); +- if (nativeLib.exists()) { ++ try { + System.out.println("Attempting to load the NativeThread library ["+libraryName+']'); + System.loadLibrary(nativeLib.getAbsolutePath()); + success = true; +- } else { ++ } catch(UnsatisfiedLinkError ule) { + try { + // Get the resource + URL resource = LibraryLoader.class.getResource(resourceName); diff --git a/net-p2p/freenet/freenet-0.7.5_p1407.ebuild b/net-p2p/freenet/freenet-0.7.5_p1407.ebuild index 28c5a11..ce368d8 100644 --- a/net-p2p/freenet/freenet-0.7.5_p1407.ebuild +++ b/net-p2p/freenet/freenet-0.7.5_p1407.ebuild @@ -70,7 +70,7 @@ src_prepare() { cp "${FILESDIR}"/freenet-0.7.5_p1389-wrapper.conf freenet-wrapper.conf || die cp "${FILESDIR}"/run.sh-20090501 run.sh || die epatch "${FILESDIR}"/0.7.5_p1302-ext.patch \ - "${FILESDIR}"/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch \ + "${FILESDIR}"/freenet-0.7.5_p1407-libraryloader-just-try-loading.patch \ "${FILESDIR}"/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \ -- 2.42.0