* [gentoo-commits] repo/proj/guru:dev commit in: x11-libs/gtk-fortran/, x11-libs/gtk-fortran/files/
@ 2021-04-24 11:50 Sergey Torokhov
0 siblings, 0 replies; 3+ messages in thread
From: Sergey Torokhov @ 2021-04-24 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 203e6852f620e793c5662129ca6e5a911496f652
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Apr 24 11:49:24 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Sat Apr 24 11:49:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=203e6852
x11-libs/gtk-fortran: add USE="static-libs" conditional patch
Closes: https://bugs.gentoo.org/781812
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
.../gtk-fortran-20.04_skip-static-build.patch | 32 ++++++++++++++++++++++
x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild | 4 ++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch b/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch
new file mode 100644
index 000000000..fb7cdd2cc
--- /dev/null
+++ b/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch
@@ -0,0 +1,32 @@
+diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -73,17 +73,16 @@
+ endif()
+
+ #======================================================
+-# Defining the static and shared gtk-fortran libraries:
++# Defining the shared gtk-fortran libraries:
+ #======================================================
+ add_library(gtk-fortran_object OBJECT ${sources})
+ # To build position independent shared libraries:
+ set_property(TARGET gtk-fortran_object PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+
+-add_library(gtk-fortran_static STATIC $<TARGET_OBJECTS:gtk-fortran_object>)
+ add_library(gtk-fortran_shared SHARED $<TARGET_OBJECTS:gtk-fortran_object>)
+ target_link_libraries(gtk-fortran_shared ${GTK_LIBRARIES})
+
+-set_target_properties(gtk-fortran_static gtk-fortran_shared PROPERTIES
++set_target_properties(gtk-fortran_shared PROPERTIES
+ OUTPUT_NAME ${gtk_V_fortran}
+ VERSION "0.1"
+ SOVERSION "0.1")
+@@ -131,7 +130,7 @@
+ #==================
+ # Files to install:
+ #==================
+-install(TARGETS gtk-fortran_static gtk-fortran_shared
++install(TARGETS gtk-fortran_shared
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
index 8bb1099e1..02d8cd0a1 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="examples high-level plplot"
+IUSE="examples high-level plplot static-libs"
REQUIRED_USE="plplot? ( high-level )"
RDEPEND="
@@ -43,6 +43,8 @@ src_prepare() {
sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \
-e "s: add_subdirectory(sketcher)::" CMakeLists.txt || die
+ use !static-libs && eapply "${FILESDIR}/${P}_skip-static-build.patch"
+
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: x11-libs/gtk-fortran/, x11-libs/gtk-fortran/files/
@ 2021-10-27 0:15 Sergey Torokhov
0 siblings, 0 replies; 3+ messages in thread
From: Sergey Torokhov @ 2021-10-27 0:15 UTC (permalink / raw
To: gentoo-commits
commit: 2268e58d2c0e577d6c35c4eb1683cb7fce0be95d
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Oct 27 00:08:26 2021 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Wed Oct 27 00:09:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2268e58d
x11-libs/gtk-fortran: change version numbering. Add SLOT
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
x11-libs/gtk-fortran/Manifest | 2 +-
...ic-build.patch => gtk-fortran-3.24.18_skip-static-build.patch} | 0
.../{gtk-fortran-20.04.ebuild => gtk-fortran-3.24.18.ebuild} | 8 ++++----
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index 260c8d2b8..ee062a8a9 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1 +1 @@
-DIST gtk-fortran-20.04.tar.gz 4066185 BLAKE2B 45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c SHA512 b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
+DIST gtk-fortran-3.24.18.tar.gz 4066185 BLAKE2B 45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c SHA512 b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch b/x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch
similarity index 100%
rename from x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch
rename to x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch
diff --git a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild b/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
similarity index 87%
rename from x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
rename to x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
index 02d8cd0a1..e0c095bfb 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,12 +10,12 @@ inherit cmake fortran-2
DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
-SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.gtk3.24.18.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/vmagnin/${PN}/archive/v20.04.gtk${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}.gtk3.24.18"
+S="${WORKDIR}/${PN}-20.04.gtk${PV}"
LICENSE="GPL-3"
-SLOT="0"
+SLOT="3"
KEYWORDS="~amd64 ~x86"
IUSE="examples high-level plplot static-libs"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: x11-libs/gtk-fortran/, x11-libs/gtk-fortran/files/
@ 2022-10-29 22:14 Sergey Torokhov
0 siblings, 0 replies; 3+ messages in thread
From: Sergey Torokhov @ 2022-10-29 22:14 UTC (permalink / raw
To: gentoo-commits
commit: f83445e50da9fc1860afcd677f6bac13c3935584
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Oct 29 22:13:50 2022 +0000
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Sat Oct 29 22:13:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f83445e5
x11-libs/gtk-fortran: drop 3.24.18; fix 'https' in metadata.xml
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
x11-libs/gtk-fortran/Manifest | 1 -
.../gtk-fortran-3.24.18_skip-static-build.patch | 32 ------------
x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild | 60 ----------------------
x11-libs/gtk-fortran/metadata.xml | 2 +-
4 files changed, 1 insertion(+), 94 deletions(-)
diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest
index 010a18a62..e7bda029d 100644
--- a/x11-libs/gtk-fortran/Manifest
+++ b/x11-libs/gtk-fortran/Manifest
@@ -1,3 +1,2 @@
-DIST gtk-fortran-3.24.18.tar.gz 4066185 BLAKE2B 45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c SHA512 b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
DIST gtk-fortran-3.24.30.tar.gz 4276622 BLAKE2B 4b18d21e0479496caea386450fc16c12d20ad3491932b331890b5d7328c704799f8dd288c4a1d0d2e34f0957f0bdca316f820850b80c4ff8d2b66ce3673fe5ec SHA512 4e1cd522ca80db01a1058d6c58b4a6e3e63e6b1d510e2ee5fd0b8f8aa9f9dc8e433d203781c908065571c4c1a6d9686c22eec879b396352b12fa82b604855c86
DIST gtk-fortran-4.1.0.tar.gz 4100843 BLAKE2B c11658472c4f2ad9916f8f421f0d1c48b9ec7874e9e4075f2247e7cfb33ed69946e644aa9a460d63ff676c075b76caf4c70bd09532dda53b4d2035c88b3c1c61 SHA512 cd4628a56b2a03f7e958d4284c595b573ab84ac6c630cfae4f3ed13bb6d19a66246cb6adac8b05104f562406a467c03841cf350f8482e7e9f8fd596de4f4c873
diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch b/x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch
deleted file mode 100644
index fb7cdd2cc..000000000
--- a/x11-libs/gtk-fortran/files/gtk-fortran-3.24.18_skip-static-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -73,17 +73,16 @@
- endif()
-
- #======================================================
--# Defining the static and shared gtk-fortran libraries:
-+# Defining the shared gtk-fortran libraries:
- #======================================================
- add_library(gtk-fortran_object OBJECT ${sources})
- # To build position independent shared libraries:
- set_property(TARGET gtk-fortran_object PROPERTY POSITION_INDEPENDENT_CODE TRUE)
-
--add_library(gtk-fortran_static STATIC $<TARGET_OBJECTS:gtk-fortran_object>)
- add_library(gtk-fortran_shared SHARED $<TARGET_OBJECTS:gtk-fortran_object>)
- target_link_libraries(gtk-fortran_shared ${GTK_LIBRARIES})
-
--set_target_properties(gtk-fortran_static gtk-fortran_shared PROPERTIES
-+set_target_properties(gtk-fortran_shared PROPERTIES
- OUTPUT_NAME ${gtk_V_fortran}
- VERSION "0.1"
- SOVERSION "0.1")
-@@ -131,7 +130,7 @@
- #==================
- # Files to install:
- #==================
--install(TARGETS gtk-fortran_static gtk-fortran_shared
-+install(TARGETS gtk-fortran_shared
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild b/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
deleted file mode 100644
index b83521beb..000000000
--- a/x11-libs/gtk-fortran/gtk-fortran-3.24.18.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_STANDARD=2003
-
-inherit cmake fortran-2
-
-DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
-HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
-SRC_URI="https://github.com/vmagnin/${PN}/archive/v20.04.gtk${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-20.04.gtk${PV}"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="examples high-level plplot static-libs"
-REQUIRED_USE="plplot? ( high-level )"
-
-RDEPEND="
- x11-libs/gtk+:3
- plplot? ( >=sci-libs/plplot-5.13.0[cairo,fortran] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/fortran
- virtual/pkgconfig
-"
-
-DOCS=( "README.md" "README-high-level.md" "CHANGELOG.md" )
-
-pkg_setup() {
- fortran-2_pkg_setup
-}
-
-src_prepare() {
- default
- # Fix library installation path, disable 'sketcher' build, pass LDFLAGS
- sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \
- -e "s: add_subdirectory(sketcher)::" \
- -e 's:"-rdynamic":"-rdynamic '"${LDFLAGS}"'":' CMakeLists.txt || die
-
- use !static-libs && eapply "${FILESDIR}/${P}_skip-static-build.patch"
-
- cmake_src_prepare
-}
-
-src_configure() {
- mycmakeargs+=(
- -DEXCLUDE_PLPLOT=$(usex plplot false true)
- -DNO_BUILD_HL=$(usex high-level false true)
- -DINSTALL_EXAMPLES=$(usex examples)
- -DNO_BUILD_EXAMPLES=true
- )
- cmake_src_configure
-}
diff --git a/x11-libs/gtk-fortran/metadata.xml b/x11-libs/gtk-fortran/metadata.xml
index f7bfd06ff..ca3bdc69a 100644
--- a/x11-libs/gtk-fortran/metadata.xml
+++ b/x11-libs/gtk-fortran/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>torokhov-s-a@yandex.ru</email>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-29 22:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-24 11:50 [gentoo-commits] repo/proj/guru:dev commit in: x11-libs/gtk-fortran/, x11-libs/gtk-fortran/files/ Sergey Torokhov
-- strict thread matches above, loose matches on Subject: below --
2021-10-27 0:15 Sergey Torokhov
2022-10-29 22:14 Sergey Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox