Skip to content

Commit

Permalink
media-gfx/gmic: add 3.2.5, drop 3.2.4
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/907946
Signed-off-by: Marek Szuba <[email protected]>
  • Loading branch information
Marek Szuba committed Jun 10, 2023
1 parent fae3e3b commit 35708a5
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
2 changes: 1 addition & 1 deletion media-gfx/gmic/Manifest
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
DIST gmic_3.2.2.tar.gz 11321544 BLAKE2B e6786fdb0342e1dfa62043837fedeea25961b375af5d1dde247be373c0ef3e35a556dc78d6dd09b5b4c4ead3b531e2bb6a7b671a400dc9d477b22f1c6c7da6b9 SHA512 be695107f8cceb94789aaa021ca431ead3e0a7f87533478df0942ea6ad94f81639de8af827bb24fbef1baccc6ded8d41b4f5386ed9ee37704c2483ea7596800e
DIST gmic_3.2.4.tar.gz 11342611 BLAKE2B f189683e0d12e707c839009449804c9db7b8afc3ff02dd033e0f9b820e889f51f4ae84b0d1e790e836761384778f4da33d79bc7b159484bbf00ec9cf88df92b2 SHA512 0a261d6242b485d7661919c14680f25d7b15d175619d8115077808c5502edb4ed313f37b3b6c6981709751d49bc7df40332aaefc03e626303135a827a5d41daf
DIST gmic_3.2.5.tar.gz 11352319 BLAKE2B 812e28119bcbe485a7551c7afc89d7efb2a46ba3d9cc31597fddcd4c4ba48fa040827eccd92c1abbef3035c057d432f6b7b783ff9067da8be2806a05902bdf35 SHA512 e453b83201fa7aff7dc193c529c6b81306e94990a03356488abbbe3acdf8eb6b07e12c16e496e9607bcb730258218b3431c489b3fd1434bb31e28727be7eae27
22 changes: 22 additions & 0 deletions media-gfx/gmic/files/gmic-3.2.5-relative_rpath.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- a/src/Makefile
+++ b/src/Makefile
@@ -188,7 +188,7 @@
ifndef NO_SRIPDLIB
MANDATORY_CFLAGS += -std=c++11 -pedantic
endif
-MANDATORY_LIBS += -L. -L$(PREFIX)/$(LIB) -Wl,-rpath,.
+MANDATORY_LIBS += -L. -L$(PREFIX)/$(LIB)
ifdef IS_GCC
MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
GCC_VER_GTEQ5 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 5)
--- a/gmic-qt/gmic_qt.pro
+++ b/gmic-qt/gmic_qt.pro
@@ -434,7 +434,7 @@

equals(GMIC_DYNAMIC_LINKING, "on" )|equals(GMIC_DYNAMIC_LINKING, "ON" ) {
message(Dynamic linking with libgmic)
- LIBS += -Wl,-rpath,. $$GMIC_PATH/libgmic.so
+ LIBS += $$GMIC_PATH/libgmic.so
}

equals(GMIC_DYNAMIC_LINKING, "off" )|equals(GMIC_DYNAMIC_LINKING, "OFF" ) {
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
"${FILESDIR}"/${PN}-3.2.0-grep38.patch
"${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch
"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
)

pkg_pretend() {
Expand Down

0 comments on commit 35708a5

Please sign in to comment.