Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
commit 04964b86ac903d6e41ea69b865f5dc1d2ca11cb7
Author: Johannes Wienke <languitar@semipol.de>
Date: Fri Nov 25 13:23:41 2016 +0100
Version bump to 3.0.0
diff --git a/.SRCINFO b/.SRCINFO
index dcca1be..1547778 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
pkgbase = protobuf-java
pkgdesc = Google's data interchange format utility (java API).
- pkgver = 2.6.1
+ pkgver = 3.0.0
pkgrel = 1
url = http://code.google.com/p/protobuf/
arch = any
license = custom:BSD
makedepends = java-environment
makedepends = maven
- makedepends = protobuf>=2.6.1
+ makedepends = protobuf>=3.0.0
depends = java-environment
- source = https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
+ source = https://github.com/google/protobuf/releases/download/v3.0.0/protobuf-java-3.0.0.tar.gz
source = protobuf-java.patch
- md5sums = f3916ce13b7fcb3072a1fa8cf02b2423
- md5sums = 01a3244c88fc5ddfee07c658c0bc7df4
+ md5sums = c5002fc32110450d06252ad6c53bb879
+ md5sums = 43b422420bec658f0471fb3f4f9558c5
pkgname = protobuf-java
diff --git a/PKGBUILD b/PKGBUILD
index 1e51d3d..999dfb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=protobuf-java
_xpkgname=protobuf
-pkgver=2.6.1
+pkgver=3.0.0
pkgrel=1
pkgdesc="Google's data interchange format utility (java API)."
url="http://code.google.com/p/protobuf/"
@@ -11,9 +11,9 @@ license=('custom:BSD')
arch=('any')
depends=("java-environment")
makedepends=('java-environment' 'maven' "${_xpkgname}>=${pkgver}")
-source=(https://github.com/google/protobuf/releases/download/v$pkgver/$_xpkgname-$pkgver.tar.gz protobuf-java.patch)
-md5sums=('f3916ce13b7fcb3072a1fa8cf02b2423'
- '01a3244c88fc5ddfee07c658c0bc7df4')
+source=(https://github.com/google/protobuf/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz protobuf-java.patch)
+md5sums=('c5002fc32110450d06252ad6c53bb879'
+ '43b422420bec658f0471fb3f4f9558c5')
build() {
cd $srcdir/$_xpkgname-$pkgver
@@ -24,7 +24,7 @@ build() {
}
package() {
- install -Dm644 "$srcdir/$_xpkgname-$pkgver/java/target/$pkgname-$pkgver.jar" \
+ install -Dm644 "$srcdir/$_xpkgname-$pkgver/java/core/target/$pkgname-$pkgver.jar" \
"$pkgdir/usr/share/java/$pkgname/$pkgname-$pkgver.jar"
install -Dm644 "$srcdir/$_xpkgname-$pkgver/LICENSE" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/protobuf-java.patch b/protobuf-java.patch
index 1286223..f3a4f84 100644
--- a/protobuf-java.patch
+++ b/protobuf-java.patch
@@ -1,21 +1,11 @@
-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" />
+--- protobuf-java-3.0.0/java/pom.xml 2016-07-28 06:24:58.000000000 +0200
++++ protobuf-3.0.0/java/pom.xml 2016-11-25 13:14:18.934847103 +0100
+@@ -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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment