* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/files/, media-gfx/graphite2/
@ 2016-02-16 10:25 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2016-02-16 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 1df59244a1e4b175e6ef30e90851da944f4486b7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 10:21:32 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 10:23:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df59244
media-gfx/graphite2: Version bump, bug 574276
Package-Manager: portage-2.2.27
media-gfx/graphite2/Manifest | 1 +
.../files/graphite2-1.3.5-includes-libs-perl.patch | 14 +++
media-gfx/graphite2/graphite2-1.3.5.ebuild | 103 +++++++++++++++++++++
3 files changed, 118 insertions(+)
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index e952aaa..1605d31 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,2 +1,3 @@
DIST graphite2-1.2.1.tgz 4665169 SHA256 7b15b749ae65c1ce3cfb4b98b8d4125e91b695ca31fa83aa51d6542109ab449d SHA512 834de9185c861f1fe54cffc2b6d12117cdd956e64167b0021ea5cb1b83deacff91a2e9d78df9a1a1c038016bf2aad252c88836c49315ca027a0fd0386d8392d9 WHIRLPOOL ec13995a19f9251bf66eeb3d66b7c8ff504ae8993868aa716cb475a69db8f675012445cd2dcb1ac594121c657aafcc1276abfa5ee38620dc6d428c1c8f51e755
DIST graphite2-1.2.4.tgz 6938866 SHA256 4bc3d5168029bcc0aa00eb2c973269d29407be2796ff56f9c80e10736bd8b003 SHA512 fb4a7bfd5656233975ce339e4e155ccb4fd401b87e30440edab98739355596e41abf5dccf6487d53f6353840a7c87b8270ee33e79c6630cf13a25ac2cb2114de WHIRLPOOL a869dcf293ba1f1d547f86ad88c6bb27879c8ad793135ba29ea12daf19d4fb84f9660fb43bd524934970d163e8bb779a050ec37a734784e25de99bd6463f3d57
+DIST graphite2-1.3.5.tgz 3880214 SHA256 f4712626eda0a1804367133460770560b545bbe75b1c4aab480c9b8e4e1c64bd SHA512 70e85ff44d63dcca6beb55aa68966888453610c4ec1fca0d0986910a8f396ad64fd0b9f393270fd403c93e7e5d45cdc134c3965f47761cd40cd659b92b8abcec WHIRLPOOL 90f5e9858c63f9c452b8457dc5dac9cb78d319dd2bfd13207bbe7e73b60dbfa701be5c17cabe4e11ce2d1be8e0054c23186834425f40d614a1002c3eff2bdcc5
diff --git a/media-gfx/graphite2/files/graphite2-1.3.5-includes-libs-perl.patch b/media-gfx/graphite2/files/graphite2-1.3.5-includes-libs-perl.patch
new file mode 100644
index 0000000..b616882
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.5-includes-libs-perl.patch
@@ -0,0 +1,14 @@
+diff -ruN graphite2-1.3.5.orig/contrib/perl/Build.PL graphite2-1.3.5/contrib/perl/Build.PL
+--- graphite2-1.3.5.orig/contrib/perl/Build.PL 2016-01-15 05:17:18.000000000 +0100
++++ graphite2-1.3.5/contrib/perl/Build.PL 2016-02-16 11:11:23.922397562 +0100
+@@ -8,8 +8,8 @@
+ dist_author => 'Simon Cozens <simon@cpan.org>',
+ dist_version_from => 'lib/Text/Gr2.pm',
+ extra_compiler_flags => $^O ne 'MSWin32' ? '-Wall -Wno-unused-variable' : '',
+- extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-lgraphite2',
+- include_dirs => ['.', '../include'],
++ extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-L @BUILD_DIR@ -lgraphite2',
++ include_dirs => ['.', '../include', '../../include'],
+ requires => {
+ 'Test::More' => 0,
+ },
diff --git a/media-gfx/graphite2/graphite2-1.3.5.ebuild b/media-gfx/graphite2/graphite2-1.3.5.ebuild
new file mode 100644
index 0000000..6faa6fc
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+GENTOO_DEPEND_ON_PERL="no"
+inherit eutils perl-module python-any-r1 cmake-multilib
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="http://graphite.sil.org/"
+SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="perl test"
+
+RDEPEND="
+ perl? ( dev-lang/perl:= )
+"
+DEPEND="${RDEPEND}
+ perl? (
+ dev-perl/Module-Build
+ dev-perl/Locale-Maketext-Lexicon
+ )
+ test? (
+ dev-libs/glib:2
+ media-libs/fontconfig
+ media-libs/silgraphite
+ ${PYTHON_DEPS}
+ perl? ( virtual/perl-Test-Simple )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+)
+
+pkg_setup() {
+ use perl && perl_set_version
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # make tests optional
+ if ! use test; then
+ sed -i \
+ -e '/tests/d' \
+ CMakeLists.txt || die
+ fi
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ "-DVM_MACHINE_TYPE=direct"
+ # http://sourceforge.net/p/silgraphite/bugs/49/
+ $([[ ${CHOST} == powerpc*-apple* ]] && \
+ echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
+ )
+
+ cmake-utils_src_configure
+
+ # fix perl linking
+ if multilib_is_native_abi && use perl; then
+ _cmake_check_build_dir init
+ sed -i \
+ -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+ "${S}"/contrib/perl/Build.PL || die
+ fi
+}
+
+src_compile() {
+ cmake-multilib_src_compile
+ if use perl; then
+ cd contrib/perl || die
+ perl-module_src_configure
+ perl-module_src_compile
+ fi
+}
+
+src_test() {
+ cmake-multilib_src_test
+ if use perl; then
+ cd contrib/perl || die
+ perl-module_src_test
+ fi
+}
+
+src_install() {
+ cmake-multilib_src_install
+ if use perl; then
+ cd contrib/perl || die
+ perl-module_src_install
+ perl_delete_localpod
+ fi
+
+ prune_libtool_files --all
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/files/, media-gfx/graphite2/
@ 2016-11-21 11:54 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2016-11-21 11:54 UTC (permalink / raw
To: gentoo-commits
commit: 8270df78a1a1d377aa3b2ebd3b5e3d1b09c75cac
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 11:54:38 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 11:54:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8270df78
media-gfx/graphite2: Removed old.
Package-Manager: portage-2.3.2
media-gfx/graphite2/Manifest | 1 -
.../files/graphite2-1.0.2-no_harfbuzz_tests.patch | 12 ---
.../files/graphite2-1.0.3-no-test-binaries.patch | 9 --
.../files/graphite2-1.1.0-includes-libs-perl.patch | 13 ---
.../graphite2/files/graphite2-1.2.0-solaris.patch | 22 ----
media-gfx/graphite2/graphite2-1.3.7.ebuild | 120 ---------------------
6 files changed, 177 deletions(-)
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index ea97524..4c32de6 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,4 +1,3 @@
DIST graphite2-1.3.5.tgz 3880214 SHA256 f4712626eda0a1804367133460770560b545bbe75b1c4aab480c9b8e4e1c64bd SHA512 70e85ff44d63dcca6beb55aa68966888453610c4ec1fca0d0986910a8f396ad64fd0b9f393270fd403c93e7e5d45cdc134c3965f47761cd40cd659b92b8abcec WHIRLPOOL 90f5e9858c63f9c452b8457dc5dac9cb78d319dd2bfd13207bbe7e73b60dbfa701be5c17cabe4e11ce2d1be8e0054c23186834425f40d614a1002c3eff2bdcc5
-DIST graphite2-1.3.7.tgz 3883666 SHA256 4d5b7ad6ae137f0c57e4ab3da4e438b7922c6c6e083cc05a3a28bd8774235586 SHA512 163ac1455003398690b173f2ce56509bba1ae1e480585635888e3b061fef1ff8493c86f4647efde65ea10cd82b4048fcc8e882ea56811a8169956ad27bd10b8f WHIRLPOOL 32c0e857c3a632e599c6057f655f3d22f2272325f1a3fd6de5d4dad754ccb750687e3c76b5a6b3af037b561c34bc8b9b081b9c5f15e14551a67cb152c23d9a3a
DIST graphite2-1.3.8.tgz 3885841 SHA256 9f3f25b3a8495ce0782e77f69075c0dd9b7c054847b9bf9ff130bec38f4c8cc2 SHA512 df8a3a7b67b356092fe8d4f62b7cd6d45ee7fe2b614699b0f8b29dc2441e00675021fdaec24cef4629c5294b33d6b269d596bc869fae8257f8f2e935c9db3639 WHIRLPOOL 88420608db053bd4d66b852a54eeb19359910c786ef1785e303e68f0d0d5b840b4a5cdcb7e17ae6c2064563d02b03a7be43ae203184218a8ac4d9dd40c17c56f
DIST graphite2-1.3.9.tgz 3889102 SHA256 ec0185b663059553fd46e8c4a4f0dede60a02f13a7a1fefc2ce70332ea814567 SHA512 6585a2b69b8226d6e9ba9ef67d94497b24f09b7ca64357c5455c276cf6f0dd3eb7fc05f5fbc79d0bb5e62ecd44e9e19bc4f4c20f7a1d9d6eeb2f89f67af5f1ac WHIRLPOOL b0ca8ca8b79319cf8806c4e0ee4bf61b240c6537c66cd57d191d74e2001b2eeb91ab19db3bf28aaddb9ab916e3f073fefd51bba3cb96f6b2ebde5a28c0bf3ea1
diff --git a/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch b/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch
deleted file mode 100644
index eb41334..00000000
--- a/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN graphite2-1.0.2.old/tests/comparerenderer/CMakeLists.txt graphite2-1.0.2/tests/comparerenderer/CMakeLists.txt
---- graphite2-1.0.2.old/tests/comparerenderer/CMakeLists.txt 2011-09-04 13:39:16.206450690 +0200
-+++ graphite2-1.0.2/tests/comparerenderer/CMakeLists.txt 2011-09-04 13:39:44.516450716 +0200
-@@ -43,7 +43,7 @@
- find_package(PkgConfig)
-
- pkg_check_modules(GR silgraphite)
-- pkg_check_modules(HB harfbuzz)
-+ #pkg_check_modules(HB harfbuzz)
- pkg_check_modules(GLIB glib-2.0)
- # pkg_check_modules(GRNG graphite)
-
diff --git a/media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch b/media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch
deleted file mode 100644
index bbc28f5..00000000
--- a/media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN graphite2-1.0.3.old/tests/comparerenderer/CMakeLists.txt graphite2-1.0.3/tests/comparerenderer/CMakeLists.txt
---- graphite2-1.0.3.old/tests/comparerenderer/CMakeLists.txt 2011-10-28 10:28:43.688602080 +0200
-+++ graphite2-1.0.3/tests/comparerenderer/CMakeLists.txt 2011-10-28 10:30:06.694603526 +0200
-@@ -132,4 +132,4 @@
- # comparetest(scheherazade_arb Scheherazadegr.ttf udhr_arb.txt --rtl)
-
- # comparerenderer can also be used for font testing
--install(TARGETS comparerenderer EXPORT comparerenderer RUNTIME DESTINATION bin)
-+# install(TARGETS comparerenderer EXPORT comparerenderer RUNTIME DESTINATION bin)
diff --git a/media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch b/media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch
deleted file mode 100644
index be41229..00000000
--- a/media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- graphite2-0.9.3.orig/contrib/perl/Build.PL
-+++ graphite2-0.9.3/contrib/perl/Build.PL
-@@ -8,8 +8,8 @@ my $builder = Module::Build->new(
- dist_author => 'Simon Cozens <simon@cpan.org>',
- dist_version_from => 'lib/Text/Graphite2.pm',
- extra_compiler_flags => $^O ne 'MSWin32' ? '-Wall -Wno-unused-variable' : '',
-- extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-lgraphite2',
-- include_dirs => ['.'],
-+ extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-L @BUILD_DIR@ -lgraphite2',
-+ include_dirs => ['.', '../../include'],
- requires => {
- 'Test::More' => 0,
- },
diff --git a/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch b/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch
deleted file mode 100644
index c3bbe51..00000000
--- a/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bidi: undef conflicting constants
-
-On Solaris ES and CS are already defined, resulting in compilation
-errors. Since we won't need Solaris' ones here, simply undef them.
-
---- graphite2-1.2.0/src/Bidi.cpp
-+++ graphite2-1.2.0/src/Bidi.cpp
-@@ -30,6 +30,14 @@
-
- using namespace graphite2;
-
-+/* Solaris' headers define these */
-+#ifdef ES
-+# undef ES
-+#endif
-+#ifdef CS
-+# undef CS
-+#endif
-+
- enum DirCode { // Hungarian: dirc
- Unk = -1,
- N = 0, // other neutrals (default) - ON
diff --git a/media-gfx/graphite2/graphite2-1.3.7.ebuild b/media-gfx/graphite2/graphite2-1.3.7.ebuild
deleted file mode 100644
index 0a60ebc..00000000
--- a/media-gfx/graphite2/graphite2-1.3.7.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit eutils perl-module python-any-r1 cmake-multilib
-
-DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
-HOMEPAGE="http://graphite.sil.org/"
-SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="perl test"
-
-RDEPEND="
- perl? ( dev-lang/perl:= )
-"
-DEPEND="${RDEPEND}
- perl? (
- dev-perl/Module-Build
- dev-perl/Locale-Maketext-Lexicon
- )
- test? (
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/silgraphite
- $(python_gen_any_dep '
- dev-python/fonttools[${PYTHON_USEDEP}]
- ')
- ${PYTHON_DEPS}
- perl? ( virtual/perl-Test-Simple )
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
-)
-
-pkg_setup() {
- use perl && perl_set_version
- use test && python-any-r1_pkg_setup
-}
-
-python_check_deps() {
- has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # make tests optional
- if ! use test; then
- sed -i \
- -e '/tests/d' \
- CMakeLists.txt || die
- fi
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- "-DVM_MACHINE_TYPE=direct"
- # https://sourceforge.net/p/silgraphite/bugs/49/
- $([[ ${CHOST} == powerpc*-apple* ]] && \
- echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
- )
-
- cmake-utils_src_configure
-
- # fix perl linking
- if multilib_is_native_abi && use perl; then
- # we rely on the fact that cmake-utils_src_configure sets BUILD_DIR
- sed -i \
- -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
- "${S}"/contrib/perl/Build.PL || die
- fi
-}
-
-src_compile() {
- cmake-multilib_src_compile
- if use perl; then
- cd contrib/perl || die
- perl-module_src_configure
- perl-module_src_compile
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- cmake-utils_src_test
- else
- einfo Cannot test since python is not multilib.
- fi
-}
-
-src_test() {
- cmake-multilib_src_test
- if use perl; then
- cd contrib/perl || die
- # SRC_TEST=do
- # Perl tests fail due to missing POD coverage...
- perl-module_src_test
- fi
-}
-
-src_install() {
- cmake-multilib_src_install
- if use perl; then
- cd contrib/perl || die
- perl-module_src_install
- perl_delete_localpod
- fi
-
- prune_libtool_files --all
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/files/, media-gfx/graphite2/
@ 2021-12-20 0:48 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-12-20 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 0d1bf1816e7e2b05f0d9435e2d266272f120d19f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 00:36:33 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 00:48:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1bf181
media-gfx/graphite2: fix build system (mainly musl build)
- Fix musl build (force in -lssp_nonshared for -nodefaultlibs)
- Fix .cmake install path
Bug: https://bugs.gentoo.org/532408
Closes: https://bugs.gentoo.org/829690
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../graphite2-1.3.14-fix-cmake-files-libdir.patch | 13 +++++++++++++
.../files/graphite2-1.35-fix-gcc-linking.patch | 18 ++++++++++++++++++
...phite2-1.3.14.ebuild => graphite2-1.3.14-r1.ebuild} | 17 +++++++++++++----
3 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-cmake-files-libdir.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-cmake-files-libdir.patch
new file mode 100644
index 000000000000..d4ae9846dce4
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-cmake-files-libdir.patch
@@ -0,0 +1,13 @@
+Fix CMake install path. Noticed as part of the SSP patch (which we handle in
+the ebuild instead).
+
+https://git.alpinelinux.org/aports/tree/main/graphite2/cmake.patch?h=3.15-stable
+https://bugs.gentoo.org/829690
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -156,4 +152,4 @@ endif()
+
+
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
+-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/cmake/graphite2 NAMESPACE gr2_)
diff --git a/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch b/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch
new file mode 100644
index 000000000000..b162ca9aa6f9
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch
@@ -0,0 +1,18 @@
+https://src.fedoraproject.org/rpms/graphite2/raw/41fb7c104c8f9293254abaa91bbda1daafb458cd/f/graphite-arm-nodefaultlibs.patch
+https://bugs.gentoo.org/829690
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -120,11 +120,7 @@
+ if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+ target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
+ else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+- if (GRAPHITE2_SANITIZERS)
+- target_link_libraries(graphite2 c gcc_s)
+- else ()
+- target_link_libraries(graphite2 c gcc)
+- endif ()
++ target_link_libraries(graphite2 c gcc_s)
+ endif()
+ include(Graphite)
+ if (BUILD_SHARED_LIBS)
+
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
similarity index 84%
rename from media-gfx/graphite2/graphite2-1.3.14.ebuild
rename to media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
index 3f1a3d4d8c22..86136261342d 100644
--- a/media-gfx/graphite2/graphite2-1.3.14.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
CMAKE_ECLASS=cmake
GENTOO_DEPEND_ON_PERL="no"
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit perl-module python-any-r1 cmake-multilib
+inherit perl-module python-any-r1 cmake-multilib flag-o-matic
DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
RDEPEND="perl? ( dev-lang/perl:= )"
DEPEND="
- perl? ( dev-lang/perl )
+ perl? ( dev-lang/perl:= )
test? ( dev-libs/glib:2 )
"
BDEPEND="
@@ -37,7 +37,11 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+ "${FILESDIR}/${PN}-1.35-fix-gcc-linking.patch"
+ "${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch"
+)
pkg_setup() {
use perl && perl_set_version
@@ -45,7 +49,7 @@ pkg_setup() {
}
python_check_deps() {
- has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+ has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
}
src_prepare() {
@@ -67,6 +71,11 @@ multilib_src_configure() {
-DGRAPHITE2_NSEGCACHE:BOOL=ON
)
+ if use elibc_musl ; then
+ # bug #829690
+ sed -i -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_shared &:' "${S}"/src/CMakeLists.txt || die
+ fi
+
cmake_src_configure
# fix perl linking
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/files/, media-gfx/graphite2/
@ 2022-09-14 18:21 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-09-14 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 3b5c8a7e7e9517ec4919f2948d04bdd5b270df48
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 18:20:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 18:21:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5c8a7e
media-gfx/graphite2: fix build w/o gcc
Closes: https://bugs.gentoo.org/870034
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../graphite2-1.3.14-fix-nodefaultlibs-deux.patch | 61 ++++++++++
.../graphite2/graphite2-1.3.14_p20210810-r2.ebuild | 124 +++++++++++++++++++++
2 files changed, 185 insertions(+)
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
new file mode 100644
index 000000000000..815301dd307b
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
@@ -0,0 +1,61 @@
+https://bugs.gentoo.org/870034
+https://bugs.gentoo.org/829690
+https://raw.githubusercontent.com/chimera-linux/cports/6d3cabd18bac6f4caaea08eaa928840552711c0c/main/graphite2/patches/clang.patch
+
+From chimera patch:
+"Clang has -nostdlib++, which can be used more effectively than disabling
+all and then hardcoding linking against libgcc (which we do not have)"
+
+Obsoletes graphite2-1.3.14-fix-nodefaultlibs.patch whose description was:
+```
+See https://github.com/silnrsi/graphite/pull/44.
+
+Drop -nodefaultlibs:
+- graphite is written in C++ which makes avoiding libstdc++ (or libc++) a dubious
+ goal;
+- this ends up breaking e.g. x86/musl because we need to inject -lssp_nonshared,
+ but it wouldn't be surprising if it broke other exotic targets too.
+```
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -47,12 +47,12 @@ else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ set_target_properties(graphite2-base PROPERTIES
+ COMPILE_FLAGS "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
+ COMPILE_DEFINITIONS "GRAPHITE2_NTRACING"
+- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
++ LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
+ LINKER_LANGUAGE C)
+ set_target_properties(graphite2-file PROPERTIES
+ COMPILE_FLAGS "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
+ COMPILE_DEFINITIONS "GRAPHITE2_NTRACING${TELEMETRY}"
+- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
++ LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
+ LINKER_LANGUAGE C)
+ endif()
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -105,7 +105,7 @@ set_target_properties(graphite2 PROPERTIES PUBLIC_HEADER "${GRAPHITE_HEADERS}"
+ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ set_target_properties(graphite2 PROPERTIES
+ COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden"
+- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
++ LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
+ LINKER_LANGUAGE C)
+ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+ add_definitions(-mfpmath=sse -msse2)
+@@ -117,15 +117,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+ add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32)
+ endif()
+- if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+- target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
+- else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+- target_link_libraries(graphite2 c gcc_s)
+- endif()
+ include(Graphite)
+- if (BUILD_SHARED_LIBS)
+- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+- endif ()
+ set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+ if (0)
+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
new file mode 100644
index 000000000000..390f3b02fb00
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit perl-module python-any-r1 cmake-multilib
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
+SRC_URI="https://github.com/silnrsi/graphite/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/graphite-${COMMIT}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="perl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="perl? ( dev-lang/perl:= )"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/glib:2 )
+"
+BDEPEND="
+ perl? (
+ dev-lang/perl
+ dev-perl/Locale-Maketext-Lexicon
+ dev-perl/Module-Build
+ )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
+ media-libs/fontconfig
+ perl? ( virtual/perl-Test-Simple )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+ "${FILESDIR}/${PN}-1.35-fix-gcc-linking.patch"
+ "${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch"
+ "${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch"
+ #"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs-deux.patch"
+)
+
+pkg_setup() {
+ use perl && perl_set_version
+ use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+ has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ cmake_src_prepare
+ use test || cmake_comment_add_subdirectory tests
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ # Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+ -DGRAPHITE2_VM_TYPE=direct
+ )
+ # https://sourceforge.net/p/silgraphite/bugs/49/
+ [[ ${CHOST} == powerpc*-apple* ]] && mycmakeargs+=(
+ -DGRAPHITE2_NSEGCACHE:BOOL=ON
+ )
+
+ if use elibc_musl ; then
+ # bug #829690
+ if use ppc || use x86 ; then
+ sed -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_nonshared &:' \
+ -i "${S}"/src/CMakeLists.txt || die
+ fi
+ fi
+
+ cmake_src_configure
+
+ # fix perl linking
+ if multilib_is_native_abi && use perl; then
+ # we rely on the fact that cmake_src_configure sets BUILD_DIR
+ sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+ -i "${S}"/contrib/perl/Build.PL || die
+ fi
+}
+
+src_compile() {
+ cmake-multilib_src_compile
+ if use perl; then
+ cd contrib/perl || die
+ perl-module_src_configure
+ perl-module_src_compile
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ cmake_src_test
+ else
+ einfo "Cannot test since python is not multilib."
+ fi
+}
+
+src_test() {
+ cmake-multilib_src_test
+ if use perl; then
+ # Perl tests fail due to missing POD coverage...
+ perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
+ cd contrib/perl || die
+ perl-module_src_test
+ fi
+}
+
+src_install() {
+ cmake-multilib_src_install
+ if use perl; then
+ cd contrib/perl || die
+ perl-module_src_install
+ perl_delete_localpod
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/files/, media-gfx/graphite2/
@ 2022-09-16 22:15 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-09-16 22:15 UTC (permalink / raw
To: gentoo-commits
commit: bb8b7e254186f5c9a2b33833f26e766f08eb0912
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 22:15:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 22:15:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb8b7e25
media-gfx/graphite2: fix build w/o gcc trois
Uncomment the patch & fix it up to work on GCC machines too.
(I'd started rebasing it before then got fed up because
of how frustrating this package has been, I think.)
Bug: https://bugs.gentoo.org/870034
Fixes: 3b5c8a7e7e9517ec4919f2948d04bdd5b270df48
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../graphite2-1.3.14-fix-nodefaultlibs-deux.patch | 112 ++++++++++++++-------
.../graphite2/graphite2-1.3.14_p20210810-r2.ebuild | 1 -
2 files changed, 78 insertions(+), 35 deletions(-)
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
index 815301dd307b..64fcfd63beab 100644
--- a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
@@ -1,61 +1,105 @@
https://bugs.gentoo.org/870034
https://bugs.gentoo.org/829690
+https://github.com/silnrsi/graphite/pull/44.
https://raw.githubusercontent.com/chimera-linux/cports/6d3cabd18bac6f4caaea08eaa928840552711c0c/main/graphite2/patches/clang.patch
-From chimera patch:
-"Clang has -nostdlib++, which can be used more effectively than disabling
-all and then hardcoding linking against libgcc (which we do not have)"
-
Obsoletes graphite2-1.3.14-fix-nodefaultlibs.patch whose description was:
-```
-See https://github.com/silnrsi/graphite/pull/44.
-
+"""
Drop -nodefaultlibs:
- graphite is written in C++ which makes avoiding libstdc++ (or libc++) a dubious
goal;
- this ends up breaking e.g. x86/musl because we need to inject -lssp_nonshared,
but it wouldn't be surprising if it broke other exotic targets too.
-```
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -47,12 +47,12 @@ else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- set_target_properties(graphite2-base PROPERTIES
- COMPILE_FLAGS "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
- COMPILE_DEFINITIONS "GRAPHITE2_NTRACING"
-- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
-+ LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
- LINKER_LANGUAGE C)
- set_target_properties(graphite2-file PROPERTIES
- COMPILE_FLAGS "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
- COMPILE_DEFINITIONS "GRAPHITE2_NTRACING${TELEMETRY}"
-- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
-+ LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
- LINKER_LANGUAGE C)
- endif()
+"""
+
+This patch is based on the linked one above from Chimera Linux. We have
+to adapt it a bit because GCC lacks -nostdlib++.
+
+Quoting it:
+"Clang has -nostdlib++, which can be used more effectively than disabling
+all and then hardcoding linking against libgcc (which we do not have)"
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -105,7 +105,7 @@ set_target_properties(graphite2 PROPERTIES PUBLIC_HEADER "${GRAPHITE_HEADERS}"
+@@ -105,7 +105,6 @@ set_target_properties(graphite2 PROPERTIES PUBLIC_HEADER "${GRAPHITE_HEADERS}"
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set_target_properties(graphite2 PROPERTIES
COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden"
- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
-+ LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
LINKER_LANGUAGE C)
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
add_definitions(-mfpmath=sse -msse2)
-@@ -117,15 +117,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
- add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32)
+@@ -114,22 +113,32 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ add_definitions(-Wno-class-memaccess -Wdouble-promotion)
endif()
-- if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
-- target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
-- else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
-- target_link_libraries(graphite2 c gcc_s)
+ message(STATUS "Compiler ID is: ${CMAKE_CXX_COMPILER_ID}")
+- if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+- add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32)
- endif()
- include(Graphite)
++
++ include(Graphite)
++
+ if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+ target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
+ else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+- if (GRAPHITE2_SANITIZERS)
+- target_link_libraries(graphite2 c gcc_s)
+- else ()
+- target_link_libraries(graphite2 c gcc)
+- endif ()
++ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
++ add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32)
++ set_target_properties(graphite2 PROPERTIES
++ LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
++ else()
++ set_target_properties(graphite2 PROPERTIES
++ LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++
++ if (GRAPHITE2_SANITIZERS)
++ target_link_libraries(graphite2 c gcc_s)
++ else()
++ target_link_libraries(graphite2 c gcc)
++ endif()
++
++ if (BUILD_SHARED_LIBS)
++ nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
++ endif ()
++ endif()
+ endif()
+- include(Graphite)
- if (BUILD_SHARED_LIBS)
- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
- endif ()
++
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
if (0)
CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -44,15 +44,25 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ COMPILE_DEFINITIONS "GRAPHITE2_STATIC;GRAPHITE2_NTRACING${TELEMETRY};_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE")
+ else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ # don't -D GRAPHITE2_STATIC so that tests can see the API symbols in the static library
++ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
++ set_target_properties(graphite2-base PROPERTIES
++ LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
++ set_target_properties(graphite2-file PROPERTIES
++ LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
++ else()
++ set_target_properties(graphite2-base PROPERTIES
++ LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++ set_target_properties(graphite2-file PROPERTIES
++ LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++ endif()
++
+ set_target_properties(graphite2-base PROPERTIES
+ COMPILE_FLAGS "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
+ COMPILE_DEFINITIONS "GRAPHITE2_NTRACING"
+- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
+ LINKER_LANGUAGE C)
+ set_target_properties(graphite2-file PROPERTIES
+ COMPILE_FLAGS "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
+ COMPILE_DEFINITIONS "GRAPHITE2_NTRACING${TELEMETRY}"
+- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
+ LINKER_LANGUAGE C)
+ endif()
+
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
index 390f3b02fb00..29a6138c3bf3 100644
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
@@ -39,7 +39,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
- "${FILESDIR}/${PN}-1.35-fix-gcc-linking.patch"
"${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch"
"${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch"
#"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs-deux.patch"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-09-16 22:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-14 18:21 [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/files/, media-gfx/graphite2/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-09-16 22:15 Sam James
2021-12-20 0:48 Sam James
2016-11-21 11:54 Lars Wendler
2016-02-16 10:25 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox