From de90af6c24eef0cfd0902a17609a401b88efd77a Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 6 Jun 2018 23:59:56 -0300 Subject: [PATCH 01/13] protobuf: update to 3.6.0.1. --- common/shlibs | 6 +++--- srcpkgs/libprotobuf | 1 + srcpkgs/libprotoc | 1 + srcpkgs/protobuf/patches/musl-fix.patch | 24 ------------------------ srcpkgs/protobuf/template | 21 ++++++++++++++------- 5 files changed, 19 insertions(+), 34 deletions(-) create mode 120000 srcpkgs/libprotobuf create mode 120000 srcpkgs/libprotoc delete mode 100644 srcpkgs/protobuf/patches/musl-fix.patch diff --git a/common/shlibs b/common/shlibs index cdecd2da52c..6dec0fb9511 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2994,9 +2994,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1 libm17n-gui.so.0 m17n-lib-1.7.0_1 libm17n-core.so.0 m17n-lib-1.7.0_1 libm17n.so.0 m17n-lib-1.7.0_1 -libprotobuf-lite.so.15 protobuf-lite-3.5.0.1_1 -libprotoc.so.15 protobuf-3.5.0.1_1 -libprotobuf.so.15 protobuf-3.5.0.1_1 +libprotobuf-lite.so.16 protobuf-lite-3.6.0_1 +libprotoc.so.16 protobuf-3.6.0_1 +libprotobuf.so.16 protobuf-3.6.0_1 libsombok.so.3 sombok-2.4.0_1 libdeviceclient.so.0 pragha-1.3.3_1 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1 diff --git a/srcpkgs/libprotobuf b/srcpkgs/libprotobuf new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/libprotobuf @@ -0,0 +1 @@ +protobuf \ No newline at end of file diff --git a/srcpkgs/libprotoc b/srcpkgs/libprotoc new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/libprotoc @@ -0,0 +1 @@ +protobuf \ No newline at end of file diff --git a/srcpkgs/protobuf/patches/musl-fix.patch b/srcpkgs/protobuf/patches/musl-fix.patch deleted file mode 100644 index 5c3b88b7c23..00000000000 --- a/srcpkgs/protobuf/patches/musl-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -seems like both musl libc and android has byteswap.h - -diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h -index 376be5f..21223f4 100644 ---- src/google/protobuf/stubs/port.h -+++ src/google/protobuf/stubs/port.h -@@ -87,7 +87,7 @@ - #include // NOLINT(build/include) - #elif defined(__APPLE__) - #include --#elif defined(__GLIBC__) || defined(__CYGWIN__) -+#elif defined(__linux__) || defined(__CYGWIN__) - #include // IWYU pragma: export - #endif - -@@ -299,7 +299,7 @@ inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64 v) { - #define bswap_32(x) OSSwapInt32(x) - #define bswap_64(x) OSSwapInt64(x) - --#elif !defined(__GLIBC__) && !defined(__CYGWIN__) -+#elif !defined(__linux__) && !defined(__CYGWIN__) - - static inline uint16 bswap_16(uint16 x) { - return static_cast(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8)); diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 3bbd35e6146..cd1087d954a 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,16 +1,17 @@ # Template file for 'protobuf' pkgname=protobuf -version=3.5.2 +version=3.6.0.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel" short_desc="Google's data interchange format" maintainer="Michael Aldridge " -distfiles="https://github.com/google/protobuf/archive/v${version}.tar.gz" -homepage="https://developers.google.com/protocol-buffers/" license="BSD-3-Clause" -checksum=4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2 +homepage="https://developers.google.com/protocol-buffers/" +#changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt" +distfiles="https://github.com/google/protobuf/archive/v${version}.tar.gz" +checksum=1144ef1fa9c50d3c04880f363b988df6ca6a66e337a945f1661cf4256ffba749 CXXFLAGS="-std=c++14" @@ -24,9 +25,14 @@ pre_configure() { autoreconf -fi } +post_install() { + vlicense LICENSE +} + protobuf-devel_package() { - depends="zlib-devel protobuf>=${version}_${revision} protobuf-lite>=${version}_${revision}" - short_desc="Google's data interchange format - development files" + depends="zlib-devel protobuf-${version}_${revision} + protobuf-lite-${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -34,8 +40,9 @@ protobuf-devel_package() { vmove "usr/lib/*.so" } } + protobuf-lite_package() { - short_desc="Google's data interchange format - Lite version" + short_desc+=" - Lite version" pkg_install() { vmove "usr/lib/libprotobuf-lite.so.*" } From 446fc05df167fe08fdd752bea61f00dbfe0b2d79 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:48 -0300 Subject: [PATCH 02/13] bitcoin: rebuild against protobuf-3.6.0 --- srcpkgs/bitcoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index e695dd4a857..b277cec9c43 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.16.0 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config yasm" From 2333871b71df463191411d7c1b3f56ff2153390e Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:49 -0300 Subject: [PATCH 03/13] clementine: rebuild against protobuf-3.6.0 --- srcpkgs/clementine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 2652758ca79..20955c9e9ec 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=13 +revision=14 patch_args="-Np1" build_style=cmake hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf-c" From ce1d412dc12c584ea8945542b3673edf2d6a6c94 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:49 -0300 Subject: [PATCH 04/13] cura-engine: rebuild against protobuf-3.6.0 --- srcpkgs/cura-engine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index 8ff820c5940..abcf24ba86a 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -1,7 +1,7 @@ # Template file for 'cura-engine' pkgname=cura-engine version=3.3.0 -revision=1 +revision=2 wrksrc="CuraEngine-${version}" build_style=cmake configure_args="-DCURA_ENGINE_VERSION=${version}" From 6625e05bcfca75cd51aa0e8f01b3406cbe688917 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:50 -0300 Subject: [PATCH 05/13] libArcus: rebuild against protobuf-3.6.0 --- srcpkgs/libArcus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index 818eb276d7e..4dcd30e78bd 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,7 +1,7 @@ # Template file for 'libArcus' pkgname=libArcus version=3.3.0 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_EXAMPLES=OFF" hostmakedepends="protobuf python3-sip-devel" From 1f6fd62706299bfc10c1feea734d0215fe345156 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:50 -0300 Subject: [PATCH 06/13] litecoin: rebuild against protobuf-3.6.0 --- srcpkgs/litecoin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index fe8bdd3bb2b..5dd49f27977 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.16.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" @@ -15,7 +15,7 @@ homepage="http://www.litecoin.org/" distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz" checksum=8364a69f05cec64e1fd492d41372552cdde86358d22bb0e074dbf917e65371a0 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools protobuf" configure_args+=" --with-boost=${XBPS_CROSS_BASE}" fi From 9d326deab59e0b0b3705a5985e1614b9248a2fcd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:51 -0300 Subject: [PATCH 07/13] mixxx: rebuild against protobuf-3.6.0 --- srcpkgs/mixxx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 59bc2327041..0e15fe62789 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.1.0 -revision=1 +revision=2 wrksrc="mixxx-release-${version}" hostmakedepends="pkg-config scons" makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel @@ -18,7 +18,7 @@ distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz" checksum=148b0ab222fa1c310e62b566d87c0a3d43fdee9435150d40d62055dbc228d396 _scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5" -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio" +nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio do_build() { case "$XBPS_TARGET_MACHINE" in From 7aefa7878df7901d56f911c40c0082d0af36743a Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:51 -0300 Subject: [PATCH 08/13] mosh: rebuild against protobuf-3.6.0 --- srcpkgs/mosh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index 6e57757ed48..f367f180125 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh version=1.3.2 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config protobuf-devel" makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel" From 2f15a4bd1c28b559137a1ff9b43e9b32776ae6ff Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:52 -0300 Subject: [PATCH 09/13] mozc: rebuild against protobuf-3.6.0 --- srcpkgs/mozc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index 7d662fc788b..193fccaa19b 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -1,7 +1,7 @@ # Template file for 'mozc' pkgname=mozc version=2.23.2785.102 -revision=1 +revision=2 hostmakedepends="ninja pkg-config protobuf-devel python" makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel fcitx-devel" @@ -10,7 +10,7 @@ maintainer="Matthias von Faber " homepage="https://github.com/google/mozc" license="3-clause-BSD" short_desc="Japanese IME (Open Source version of Google Japanese Input)" -build_wrksrc="mozc/src" +build_wrksrc=mozc/src create_wrksrc=yes distfiles=" https://github.com/fcitx/mozc/archive/44820a08db487fb1abe996f3ac2876457b05465d.tar.gz @@ -23,7 +23,7 @@ checksum=" 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1 " -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" fi @@ -39,7 +39,7 @@ post_extract() { ln -sr $_src-* $_dst done - if [ -n "$CROSS_BUILD" ]; then + if [ "$CROSS_BUILD" ]; then # find fcitx4-config sed -i -e "s;fcitx4-config;${XBPS_CROSS_BASE}/usr/bin/fcitx4-config;" mozc/src/unix/fcitx/fcitx.gyp fi From 1340e56835fc71148228afd2d711c6ce3ccffc95 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:52 -0300 Subject: [PATCH 10/13] mumble: rebuild against protobuf-3.6.0 --- srcpkgs/mumble/template | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 3a8e3c3e1b4..743422b1828 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,21 +1,21 @@ # Template file for 'mumble' pkgname=mumble version=1.2.19 -revision=9 -hostmakedepends="pkg-config qt-host-tools qt-qmake protobuf Ice" -makedepends=" - libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel libressl-devel - speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel - avahi-compat-libs-devel MesaLib-devel opus-devel libogg-devel boost-devel - speech-dispatcher-devel" -depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme" +revision=10 +hostmakedepends="Ice pkg-config protobuf qt-host-tools qt-qmake" +makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel + libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel + pulseaudio-devel qt-devel speech-dispatcher-devel speex-devel" +depends="desktop-file-utils qt-plugin-sqlite" short_desc="Open source, low-latency, high quality voice chat for gaming" maintainer="Juan RP " +license="BSD-3-Clause" homepage="http://mumble.sourceforge.net/" -license="BSD" distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8 +CXXFLAGS="-std=c++11" + do_configure() { if [ "$CROSS_BUILD" ]; then for i in ${XBPS_CROSS_BASE}/usr/include/Qt*; do @@ -38,10 +38,12 @@ do_configure() { -e "s;^\(LFLAGS.*=.*\);& $LDFLAGS;" \ -e "s;^\(CXXFLAGS.*=.*\);& $CXXFLAGS;" } + do_build() { make ${makejobs} release \ CC="$CC" CXX="$CXX" LINK="$CXX" } + do_install() { vlicense LICENSE vmkdir usr/lib/mumble From 14003a7cebe4b51338b3535f97985a87899ecb46 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:53 -0300 Subject: [PATCH 11/13] nsjail: rebuild against protobuf-3.6.0 --- srcpkgs/nsjail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index 71f9c659ed9..6845ee1e42c 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,7 +1,7 @@ # Template file for 'nsjail' pkgname=nsjail version=2.6 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf-devel" makedepends="libnl3-devel protobuf-devel" From b2625404f7b9ba9bdd309811616da496c640b943 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:54 -0300 Subject: [PATCH 12/13] zbackup: rebuild against protobuf-3.6.0 --- srcpkgs/zbackup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index 1e1f6c07bdc..a8bf8a1013e 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,7 +1,7 @@ # Template file for 'zbackup' pkgname=zbackup version=1.4.4 -revision=9 +revision=10 build_style=cmake hostmakedepends="protobuf" makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel" From a478bc2efa0ac25fbc0d5fed628bbb86b2f4da4a Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:02:25 -0300 Subject: [PATCH 13/13] protobuf-c: rebuild against protobuf-3.6.0. --- srcpkgs/protobuf-c/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index c50b98236a9..d8530462f7a 100644 --- a/srcpkgs/protobuf-c/template +++ b/srcpkgs/protobuf-c/template @@ -1,16 +1,17 @@ # Template file for 'protobuf-c' pkgname=protobuf-c version=1.3.0 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="pkg-config protobuf" makedepends="protobuf-devel" short_desc="C implementation of the Google Protocol Buffers" maintainer="Enno Boland " -license="BSD" +license="BSD-2-Clause" homepage="https://github.com/protobuf-c/protobuf-c" -distfiles="$homepage/releases/download/v$version/protobuf-c-$version.tar.gz" +distfiles="${homepage}/releases/download/v${version}/protobuf-c-${version}.tar.gz" checksum=5dc9ad7a9b889cf7c8ff6bf72215f1874a90260f60ad4f88acf21bb15d2752a1 + # buildprocess calls compiler while building, disable it on cross build build_options="protoc" if [ -z "$CROSS_BUILD" ]; then @@ -18,6 +19,10 @@ if [ -z "$CROSS_BUILD" ]; then fi configure_args="$(vopt_enable protoc)" +post_install() { + vlicense LICENSE +} + protobuf-c-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"