protobuf-java-3.3.0-1: updating version

2 files changed, 36 insertions, 50 deletions

diff --git a/pcr/protobuf-java/PKGBUILD b/pcr/protobuf-java/PKGBUILD
index 33a08201e..9db930801 100644
--- a/pcr/protobuf-java/PKGBUILD
+++ b/pcr/protobuf-java/PKGBUILD
@@ -2,59 +2,53 @@
 
 _libname=protobuf
 pkgname=${_libname}-java
-pkgver=2.6.1
-pkgrel=1.1
-pkgdesc="Google's data interchange format utility (java API)."
-url="http://code.google.com/p/protobuf/"
+pkgver=3.3.0
+pkgrel=1
+pkgdesc="Google's data interchange format utility (Java API)."
+url="https://github.com/google/protobuf"
 license=('custom:BSD')
 arch=('any')
 depends=('java-runtime')
-makedepends=('java-environment' 'jh' "${_libname}>=${pkgver}")
-source=("https://github.com/google/${_libname}/releases/download/v${pkgver}/${_libname}-${pkgver}.tar.gz"
+makedepends=('java-environment' 'jh' "${_libname}>=$pkgver")
+source=("https://github.com/google/${_libname}/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
         'protobuf-java.patch')
-sha256sums=('dbbd7bdd2381633995404de65a945ff1a7610b0da14593051b4738c90c6dd164'
-            '60a83c90dc00c819c6614791956aa2957e1d6245fc51a38840416e8506ea1dfc')
+sha256sums=('8cdd5a71a350331f18789bcb7e1e9e6e82765e4529b43e6cd9bafbf6c1c1677c'
+            'eb76e92d5a0778bb0518651e225571bb3e439cd569d9b11bfa3ef5625635e2b9')
 
 prepare() {
-  cd "${srcdir}/${_libname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/protobuf-java.patch"
+  cd "${_libname}-$pkgver"
+  patch -Np1 -i ../protobuf-java.patch
 
   cd java
   mkdir -p build/classes
 }
 
 build() {
-  cd "${srcdir}/${_libname}-${pkgver}/java"
+  cd "${_libname}-$pkgver/java"
 
-  protoc --java_out=src/main/java -I../src \
-          ../src/google/protobuf/descriptor.proto
+  protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto
 
-  javac -cp . -d "build/classes" \
-    $(find "src/main/java" -name \*.java)
+  javac -d "build/classes" $(find core/src/main/java -name \*.java)
+  javadoc -d "build/javadoc" -sourcepath "core/src/main/java" -subpackages com
 
-  javadoc -d "build/javadoc" \
-    -sourcepath "src/main/java" -subpackages com
-
-  jar -cvf "${_libname}.jar" -C "build/classes" .
+  jar -cvf "${_libname}.jar" -C build/classes .
 }
 
 package() {
-  cd "${srcdir}/${_libname}-${pkgver}/java"
+  cd "${_libname}-$pkgver/java"
 
   # Install license file
-  install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+  install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
 
   # Install documentation
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "build/javadoc" "${pkgdir}/usr/share/doc/${pkgname}"
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r build/javadoc "$pkgdir/usr/share/doc/$pkgname"
 
   # Install Maven artifacts
-  export DESTDIR=${pkgdir}
-  jh mvn-install "com.google.${_libname}" "${_libname}-java" ${pkgver} \
-    pom.xml \
-    "${_libname}.jar" \
-    "${_libname}-${pkgver}.jar"
+  export DESTDIR=$pkgdir
+  jh mvn-install "com.google.${_libname}" $pkgname $pkgver \
+    pom.xml "${_libname}.jar" "${_libname}-$pkgver.jar"
 
-  ln -s "/usr/share/java/${_libname}-${pkgver}.jar" \
+  ln -s "/usr/share/java/${_libname}-$pkgver.jar" \
     "${pkgdir}/usr/share/java/${_libname}.jar"
 }
diff --git a/pcr/protobuf-java/protobuf-java.patch b/pcr/protobuf-java/protobuf-java.patch
index 1286223ed..049d44f39 100644
--- a/pcr/protobuf-java/protobuf-java.patch
+++ b/pcr/protobuf-java/protobuf-java.patch
@@ -1,21 +1,13 @@
-diff -aur protobuf-2.4.1/java/pom.xml protobuf-2.4.1-patched/java/pom.xml
---- protobuf-2.4.1/java/pom.xml	2011-04-30 19:23:04.000000000 +0200
-+++ protobuf-2.4.1-patched/java/pom.xml	2011-05-09 17:58:09.000000000 +0200
-@@ -78,7 +78,7 @@
-             <configuration>
-               <tasks>
-                 <mkdir dir="target/generated-sources" />
--                <exec executable="../src/protoc">
-+                <exec executable="protoc">
-                   <arg value="--java_out=target/generated-sources" />
-                   <arg value="--proto_path=../src" />
-                   <arg value="../src/google/protobuf/descriptor.proto" />
-@@ -96,7 +96,7 @@
-             <configuration>
-               <tasks>
-                 <mkdir dir="target/generated-test-sources" />
--                <exec executable="../src/protoc">
-+                <exec executable="protoc">
-                   <arg value="--java_out=target/generated-test-sources" />
-                   <arg value="--proto_path=../src" />
-                   <arg value="--proto_path=src/test/java" />
+diff --git a/java/pom.xml b/java/pom.xml
+index 881473f..e56bd94 100644
+--- a/java/pom.xml
++++ b/java/pom.xml
+@@ -29,7 +29,7 @@
+     <!-- These are relative to the submodules -->
+     <protobuf.basedir>${project.basedir}/../..</protobuf.basedir>
+     <protobuf.source.dir>${protobuf.basedir}/src</protobuf.source.dir>
+-    <protoc>${protobuf.source.dir}/protoc</protoc>
++    <protoc>protoc</protoc>
+     <test.proto.dir>src/test/proto</test.proto.dir>
+     <generated.sources.dir>${project.build.directory}/generated-sources</generated.sources.dir>
+     <generated.testsources.dir>${project.build.directory}/generated-test-sources</generated.testsources.dir>