[arch-commits] Commit in eclipse-ecj/trunk (01-ecj-include-props.patch PKGBUILD)

[Maxime Gauduin]

    Date: Wednesday, January 26, 2022 @ 10:52:13
  Author: alucryd
Revision: 435161

upgpkg: eclipse-ecj 4.22-1

Modified:
  eclipse-ecj/trunk/01-ecj-include-props.patch
  eclipse-ecj/trunk/PKGBUILD

----------------------------+
 01-ecj-include-props.patch |   17 ++++---------
 PKGBUILD                   |   55 +++++++++++++++++++++++--------------------
 2 files changed, 36 insertions(+), 36 deletions(-)

Modified: 01-ecj-include-props.patch
===================================================================
--- 01-ecj-include-props.patch	2022-01-26 10:52:11 UTC (rev 435160)
+++ 01-ecj-include-props.patch	2022-01-26 10:52:13 UTC (rev 435161)
@@ -1,15 +1,10 @@
---- build.xml	2012-09-14 18:22:48.000000000 +0000
-+++ build.xml.patched	2013-01-09 10:19:28.414079935 +0000
-@@ -46,9 +46,10 @@
- 				<include name="**/*.rsc"/>
+--- build.xml.orig	2022-01-26 11:48:44.269379689 +0100
++++ build.xml	2022-01-26 11:49:09.631741629 +0100
+@@ -41,6 +41,7 @@
+ 				<include name="**/readableNames.props"/>
  				<include name="META-INF/**"/>
  				<include name="**/*.properties"/>
 +				<include name="**/*.props"/>
  				<exclude name="META-INF/eclipse.inf"/>
- 			</fileset>
- 		</zip>
- 		<delete dir="${output}" />
- 	</target>
--</project>
-\ No newline at end of file
-+</project>
+ 				<exclude name="META-INF/ECLIPSE_.SF"/>
+ 				<exclude name="META-INF/ECLIPSE_.RSA"/>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-26 10:52:11 UTC (rev 435160)
+++ PKGBUILD	2022-01-26 10:52:13 UTC (rev 435161)
@@ -3,28 +3,32 @@
 # Contributor: Allan McRae <allan at archlinux.org>
 
 pkgname=eclipse-ecj
-pkgver=4.6.3
-pkgrel=2
-_date=201703010400
+pkgver=4.22
+pkgrel=1
+_date=202111241800
 pkgdesc='Eclipse java bytecode compiler'
-arch=('any')
-license=('EPL')
-url='https://www.eclipse.org/'
-makedepends=('ant' 'java-environment=8')
+arch=(any)
+license=(EPL)
+url=https://www.eclipse.org/
+makedepends=(
+  ant
+  java-environment=11
+)
 _base_url=https://archive.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}
 _source_file_name=ecjsrc-${pkgver}.jar
 _sha_file_name=eclipse-${pkgver}-SUMSSHA512
-source=(${_base_url}/${_source_file_name}
-        ${_base_url}/checksum/${_sha_file_name}{,.asc}
-        01-ecj-include-props.patch
-        02-buildxml-fix-manifest.patch
-        ecj)
-validpgpkeys=('869FF7E31C98FBCFCF167CDE01D81CA560A48EFD') # Eclipse Project
-
-sha512sums=('a509b6d1fd7e5218ca6d9748b6c899c8c57a9d016d01e3f1d2116876f3aab796f792e1b1733189a436b6251caf8c208ec3928e3978cd0803c1449b29eae1891d'
-            '2965df1005362bb4e6e17b5048ca17c0b583c746f8ac05c46451ff603707816d7eb7b9e4ffc398fadaa18229ef0d41993f3126802c22fa2c6d488dc03797557a'
-            'SKIP'
-            '72c8a2437333e8068e60e1a035bf4e5e9b66881fc06936600a6867dc7e4eb4670f94c4b2392634ebb28f85f8fdf88248ccb9cc315717e257ce336b495c2f2d68'
+source=(
+  ${_base_url}/${_source_file_name}
+  #${_base_url}/checksum/${_sha_file_name}{,.asc}
+  ${_base_url}/checksum/${_sha_file_name}
+  01-ecj-include-props.patch
+  02-buildxml-fix-manifest.patch
+  ecj
+)
+validpgpkeys=(3C91FED3922D52296888BAE9B6D3AB9BCC641282) # Eclipse Platform Project <platform-releng-dev at eclipse.org>
+sha512sums=('cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c'
+            'd4ba6a2bd89e0804e0ae45f9f7bc49e05f65cc2339638e73d9e00663686ebd288ff6badcda00baed664790fce6e875b3d05513d5d89f644547c3fec665366e14'
+            '0eb47ad770e2b7bff82cfe933073a044d3c506946436671f6a76a43c94a72194c8fc93eaf065512235214dce8fc1730cf93fab7dfa106adeb1b814336ca46281'
             '11ca94869d71842401e48acca72fd89e339ba65c81909cf8501bb243457caa21dc659d268b98c42ac77a1834fb7de46138787e8ea0966d96324c8de829fe563c'
             '1895c12c63262a08a2c889bb1db61308b5cb8846e5f20e584cde6878afd4da5ee051045a61a0a5a4498146a7315c8a14bf120e5d369365f4efc573d371381846')
 
@@ -43,17 +47,18 @@
 }
 
 build() {
-  cd "${srcdir}"
   export LANG=en_US.UTF-8
   ant build
 }
 
 package() {
-  depends=('java-runtime')
+  depends=(java-runtime)
 
-  install -Dm644 "${srcdir}/ecj.jar" "${pkgdir}/usr/share/java/eclipse-ecj-${pkgver}.jar"
-  ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}/usr/share/java/ecj.jar"
-  ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}/usr/share/java/eclipse-ecj.jar"
-  install -Dm755 ecj "${pkgdir}/usr/bin/ecj"
-  install -D -m 644 ecj.1 "${pkgdir}/usr/share/man/man1/ecj.1"
+  install -Dm 644 "${srcdir}"/ecj.jar "${pkgdir}"/usr/share/java/eclipse-ecj-${pkgver}.jar
+  ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}"/usr/share/java/ecj.jar
+  ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}"/usr/share/java/eclipse-ecj.jar
+  install -Dm 755 ecj -t "${pkgdir}"/usr/bin/
+  install -Dm 644 ecj.1 -t "${pkgdir}"/usr/share/man/man1/
 }
+
+# vim: ts=2 sw=2 et: