From 3b8e58576bb4e5a24f44480f6d70f0abe71d3069 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 28 Jun 2023 18:14:40 +0000 Subject: Adding metadata --- dev-java/gradle-bin/gradle-bin-8.1.1.ebuild | 2 +- dev-java/protobuf-java/Manifest | 1 + ...obuf-java-3.23.0-unittest_retention.proto.patch | 35 +++++ dev-java/protobuf-java/metadata.xml | 8 +- dev-java/protobuf-java/protobuf-java-3.23.0.ebuild | 165 +++++++++++++++++++++ dev-java/swt/swt-4.28-r1.ebuild | 143 ++++++++++++++++++ dev-java/swt/swt-4.28.ebuild | 143 ------------------ 7 files changed, 350 insertions(+), 147 deletions(-) create mode 100644 dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch create mode 100644 dev-java/protobuf-java/protobuf-java-3.23.0.ebuild create mode 100644 dev-java/swt/swt-4.28-r1.ebuild delete mode 100644 dev-java/swt/swt-4.28.ebuild (limited to 'dev-java') diff --git a/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild index 6fceca3ae5c8..7d07ab9dc4b0 100644 --- a/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild +++ b/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/" LICENSE="Apache-2.0" SLOT="${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND="app-eselect/eselect-gradle" BDEPEND="app-arch/unzip" diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 1af6191837ab..038dff1f6153 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,2 +1,3 @@ DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346 +DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 diff --git a/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch b/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch new file mode 100644 index 000000000000..c838bf3cede2 --- /dev/null +++ b/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch @@ -0,0 +1,35 @@ +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:68: error: cannot find symbol +import protobuf_unittest.UnittestRetention; + ^ + symbol: class UnittestRetention + location: package protobuf_unittest +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:402: error: cannot find symbol + FileOptions options = UnittestRetention.getDescriptor().getOptions(); + ^ + symbol: variable UnittestRetention + location: class DescriptorsTest +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:403: error: cannot find symbol + assertThat(options.hasExtension(UnittestRetention.plainOption)).isTrue(); + ^ + symbol: variable UnittestRetention + location: class DescriptorsTest +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:404: error: cannot find symbol + assertThat(options.hasExtension(UnittestRetention.runtimeRetentionOption)).isTrue(); + ^ + symbol: variable UnittestRetention + location: class DescriptorsTest +java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:405: error: cannot find symbol + assertThat(options.hasExtension(UnittestRetention.sourceRetentionOption)).isFalse(); + ^ + symbol: variable UnittestRetention + location: class DescriptorsTest +--- a/java/core/generate-test-sources-build.xml ++++ b/java/core/generate-test-sources-build.xml +@@ -19,6 +19,7 @@ + + + ++ + + + diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml index b0095731b623..4cf5fd3f4332 100644 --- a/dev-java/protobuf-java/metadata.xml +++ b/dev-java/protobuf-java/metadata.xml @@ -14,9 +14,11 @@ cpe:/a:google:protobuf + https://github.com/protocolbuffers/protobuf/issues + https://protobuf.dev/getting-started/javatutorial/ + + Use protoc provided by dev-libs/protobuf + gentoo-staging - - Soname version number of Protobuf - \ No newline at end of file diff --git a/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild new file mode 100644 index 000000000000..aaf13ce4b65e --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.23.0.ebuild @@ -0,0 +1,165 @@ +# Copyright 2008-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.protobuf:protobuf-java:3.23.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple cmake + +DESCRIPTION="Core Protocol Buffers library" +HOMEPAGE="https://protobuf.dev" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 3.23.0 from the 23.0 tarball in order to allow sharing the tarball with +# dev-libs/protobuf. +SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" +S="${WORKDIR}/protobuf-${PV#3.}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-protoc" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +BDEPEND=" + system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 ) + !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.2 ) +" + +PATCHES=( + "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch" +) + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="java/core/src/main/resources" +JAVA_SRC_DIR="java/core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_SRC_DIR="java/core/src/test/java" + +run-protoc() { + if use system-protoc; then + protoc $1 + else + "${BUILD_DIR}"/protoc $1 + fi +} + +src_prepare() { + # If the corrsponding version of system-protoc is not available we build protoc locally + if use system-protoc; then + : + else + cmake_src_prepare + fi + java-pkg-2_src_prepare + + mkdir "${JAVA_RESOURCE_DIRS}" || die + # https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/pom.xml#L43-L62 + PROTOS=( $(sed \ + -n '/google\/protobuf.*\.proto/s:.*\(.*\):\1:p' \ + "${S}/java/core/pom.xml") ) || die + pushd src > /dev/null || die + cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die + popd > /dev/null || die + + # https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/generate-sources-build.xml + einfo "Replace variables in generate-sources-build.xml" + sed \ + -e 's:${generated.sources.dir}:java/core/src/main/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i java/core/generate-sources-build.xml || die "sed to sources failed" + + # https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/generate-test-sources-build.xml + einfo "Replace variables in generate-test-sources-build.xml" + sed \ + -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ + -e 's:${protobuf.source.dir}:src:' \ + -e 's:${test.proto.dir}:java/core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Split the file in two parts, one for each run-protoc call + awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ + java/core/generate-test-sources-build.xml || die +} + +src_configure() { + local mycmakeargs=( + -Dprotobuf_BUILD_TESTS=OFF + -Dprotobuf_ABSL_PROVIDER=package + ) + if use system-protoc; then + : + else + cmake_src_configure + fi +} + +src_compile() { + if use system-protoc; then + : + else + cmake_src_compile + fi + + einfo "Run protoc to generate sources" + run-protoc \ + @java/core/generate-sources-build.xml \ + || die "protoc sources failed" + + java-pkg-simple_src_compile +} + +src_test() { + # https://github.com/protocolbuffers/protobuf/blob/v23.0/java/core/pom.xml#L63-L71 + jar cvf testdata.jar \ + -C src google/protobuf/testdata/golden_message_oneof_implemented \ + -C src google/protobuf/testdata/golden_packed_fields_message || die + + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" + + einfo "Running protoc on first part of generate-test-sources-build.xml" + run-protoc @test-sources-build-1 \ + || die "run-protoc test-sources-build-1 failed" + + einfo "Running protoc on second part of generate-test-sources-build.xml" + run-protoc @test-sources-build-2 \ + || die "run-protoc test-sources-build-2 failed" + + einfo "Running tests" + # Invalid test class 'map_test.MapInitializationOrderTest': + # 1. Test class should have exactly one public constructor + # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': + # 1. Test class should have exactly one public constructor + pushd "${JAVA_TEST_SRC_DIR}" || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -path "**/*Test.java" \ + ! -path "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -path '*protobuf_unittest/CachedFieldSizeTest.java' + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install +} diff --git a/dev-java/swt/swt-4.28-r1.ebuild b/dev-java/swt/swt-4.28-r1.ebuild new file mode 100644 index 000000000000..46698300250e --- /dev/null +++ b/dev-java/swt/swt-4.28-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs + +MY_PV="${PV/_rc/RC}" +MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202306050440" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="https://www.eclipse.org/swt/" +SRC_URI=" + amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) + arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip ) + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.27" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="cairo opengl webkit" + +COMMON_DEP=" + app-accessibility/at-spi2-core:2 + dev-libs/glib + x11-libs/gtk+:3 + x11-libs/libXtst + cairo? ( x11-libs/cairo ) + opengl? ( + virtual/glu + virtual/opengl + ) + webkit? ( + net-libs/webkit-gtk:4.1 + )" +DEPEND="${COMMON_DEP} + >=virtual/jdk-11:*[-headless-awt] + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.8:*" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" + +HTML_DOCS=( about.html ) + +JAVA_RESOURCE_DIRS="resources" +JAVA_SRC_DIR="src" + +PATCHES=( + "${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch" +) + +src_unpack() { + default + unpack "./src.zip" +} + +src_prepare() { + default + java-pkg-2_src_prepare + # .css stuff is essential at least for running net-p2p/biglybt + unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die + java-pkg_clean + mkdir src || die "mkdir failed" + mv org src || die "moving java sources failed" + find src -type f ! -name '*.java' | xargs \ + cp --parent -t resources -v || die "copying resources failed" + cp version.txt resources || die "adding version.txt failed" +} + +src_compile() { + append-cflags -fcommon # https://bugs.gentoo.org/707838 + + local JAWTSO="libjawt.so" + IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) + + for libpath in "${ldpaths[@]}"; do + if [[ -f "${libpath}/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}" + break + # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10 + elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}/$(tc-arch)" + break + fi + done + + if [[ -z "${AWT_LIB_PATH}" ]]; then + eerror "${JAWTSO} not found in the JDK being used for compilation!" + die "cannot build AWT library" + fi + + # Fix the pointer size for AMD64 + export SWT_PTR_CFLAGS=-DJNI64 + + # Bug #461784, g_thread_init is deprecated since glib-2.32. + append-cflags -DNO__1g_1thread_1init + + local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" + + einfo "Building AWT library" + export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)" + ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" + + einfo "Building SWT library" + ${make} make_swt + + einfo "Building JAVA-AT-SPI bridge" + ${make} make_atk + + if use cairo ; then + einfo "Building CAIRO support" + ${make} make_cairo + fi + + if use opengl ; then + einfo "Building OpenGL component" + ${make} make_glx + fi + + if use webkit ; then + einfo "Building WebKit component" + ${make} make_webkit + fi + + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + + java-pkg_sointo "/usr/$(get_libdir)/swt" + java-pkg_doso *.so +} diff --git a/dev-java/swt/swt-4.28.ebuild b/dev-java/swt/swt-4.28.ebuild deleted file mode 100644 index 3ce70c836f01..000000000000 --- a/dev-java/swt/swt-4.28.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs - -MY_PV="${PV/_rc/RC}" -MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202306050440" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="https://www.eclipse.org/swt/" -SRC_URI=" - amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) - arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip ) - ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.27" -KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="cairo opengl webkit" - -COMMON_DEP=" - app-accessibility/at-spi2-core:2 - dev-libs/glib - x11-libs/gtk+:2 - x11-libs/libXtst - cairo? ( x11-libs/cairo ) - opengl? ( - virtual/glu - virtual/opengl - ) - webkit? ( - net-libs/webkit-gtk:4.1 - )" -DEPEND="${COMMON_DEP} - >=virtual/jdk-11:*[-headless-awt] - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" - -HTML_DOCS=( about.html ) - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="src" - -PATCHES=( - "${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch" -) - -src_unpack() { - default - unpack "./src.zip" -} - -src_prepare() { - default - java-pkg-2_src_prepare - # .css stuff is essential at least for running net-p2p/biglybt - unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die - java-pkg_clean - mkdir src || die "mkdir failed" - mv org src || die "moving java sources failed" - find src -type f ! -name '*.java' | xargs \ - cp --parent -t resources -v || die "copying resources failed" - cp version.txt resources || die "adding version.txt failed" -} - -src_compile() { - append-cflags -fcommon # https://bugs.gentoo.org/707838 - - local JAWTSO="libjawt.so" - IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) - - for libpath in "${ldpaths[@]}"; do - if [[ -f "${libpath}/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${libpath}" - break - # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10 - elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${libpath}/$(tc-arch)" - break - fi - done - - if [[ -z "${AWT_LIB_PATH}" ]]; then - eerror "${JAWTSO} not found in the JDK being used for compilation!" - die "cannot build AWT library" - fi - - # Fix the pointer size for AMD64 - export SWT_PTR_CFLAGS=-DJNI64 - - # Bug #461784, g_thread_init is deprecated since glib-2.32. - append-cflags -DNO__1g_1thread_1init - - local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" - - einfo "Building AWT library" - export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)" - ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" - - einfo "Building SWT library" - ${make} make_swt - - einfo "Building JAVA-AT-SPI bridge" - ${make} make_atk - - if use cairo ; then - einfo "Building CAIRO support" - ${make} make_cairo - fi - - if use opengl ; then - einfo "Building OpenGL component" - ${make} make_glx - fi - - if use webkit ; then - einfo "Building WebKit component" - ${make} make_webkit - fi - - java-pkg-simple_src_compile -} - -src_install() { - java-pkg-simple_src_install - - java-pkg_sointo "/usr/$(get_libdir)/swt" - java-pkg_doso *.so -} -- cgit v1.3