mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-04-07 03:10:15 -04:00
x11-libs/gtk-fortran: drop 19.04
Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
This commit is contained in:
Sergey Torokhov
@@ -1,2 +1 @@
|
||||
DIST gtk-fortran-19.04.tar.gz 4164311 BLAKE2B 728d55890344894df534de1530135933e488ea197dc2d9b8f28571ce56a236e7fe2be23ebc4708e1ae5ffeb10e4ee584db366945e3d262225c4e9f7db4fa611d SHA512 58154df7c531ebfabcc687f8f38d3c7db7f7adb6cc015e1ce9c44455ab2506a4dfe6b073a88100131ac3712fee68844e4544f2f77d954285e3fbc86e1b3d9394
|
||||
DIST gtk-fortran-20.04.tar.gz 4066185 BLAKE2B 45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c SHA512 b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
|
||||
|
||||
@@ -1,96 +0,0 @@
|
||||
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt 2019-04-24 10:53:11.000000000 +0300
|
||||
+++ b/CMakeLists.txt 2020-04-13 07:05:14.000000000 +0300
|
||||
@@ -194,7 +194,7 @@
|
||||
# As a temporary (?) workaround, we are now using pkg-config.
|
||||
# If a CMake error occurs, add -D EXCLUDE_PLPLOT=true to your CMake command.
|
||||
#===============================================================================
|
||||
-if (NOT EXCLUDE_PLPLOT)
|
||||
+if (NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
|
||||
find_package(PkgConfig REQUIRED)
|
||||
|
||||
pkg_check_modules(PLPLOT-FORTRAN REQUIRED plplot-fortran)
|
||||
@@ -211,9 +211,9 @@
|
||||
include_directories(${PLPLOT_INCLUDE_DIRS})
|
||||
set(CMAKE_REQUIRED_LIBRARIES "${PLPLOT_LIBRARIES}")
|
||||
set(CMAKE_REQUIRED_INCLUDES "${PLPLOT-FORTRAN_INCLUDE_DIRS}")
|
||||
-else(NOT EXCLUDE_PLPLOT)
|
||||
+else(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
|
||||
message(STATUS "PLPLOT Excluded as command option")
|
||||
-endif(NOT EXCLUDE_PLPLOT)
|
||||
+endif(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
|
||||
|
||||
|
||||
#===============================================================================
|
||||
@@ -223,10 +223,10 @@
|
||||
add_subdirectory(test)
|
||||
add_subdirectory(examples)
|
||||
|
||||
-if(${GTKv} GREATER 2)
|
||||
- add_subdirectory(sketcher)
|
||||
-endif()
|
||||
-
|
||||
-if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
|
||||
- add_subdirectory(plplot)
|
||||
-endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
|
||||
+if(NOT NO_BUILD_HL)
|
||||
+ if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
|
||||
+ add_subdirectory(plplot)
|
||||
+ endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
|
||||
+else(NOT NO_BUILD_HL)
|
||||
+ message(STATUS "High Level API Excluded as command option")
|
||||
+endif(NOT NO_BUILD_HL)
|
||||
diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
--- a/src/CMakeLists.txt 2019-04-24 10:53:11.000000000 +0300
|
||||
+++ b/src/CMakeLists.txt 2020-04-13 11:28:22.000000000 +0300
|
||||
@@ -33,28 +33,33 @@
|
||||
"gdk-pixbuf-auto.f90"
|
||||
"glib-auto.f90"
|
||||
"gtk.f90"
|
||||
- "gtk-hl.f90"
|
||||
- "gtk-hl-container.f90"
|
||||
- "gtk-hl-button.f90"
|
||||
- "gtk-hl-entry.f90"
|
||||
- "gtk-hl-tree.f90"
|
||||
- "gtk-hl-menu.f90"
|
||||
- "gtk-hl-combobox.f90"
|
||||
- "gtk-hl-spin-slider.f90"
|
||||
- "gtk-hl-chooser.f90"
|
||||
- "gtk-hl-dialog.f90"
|
||||
- "gtk-hl-progress.f90"
|
||||
- "gtk-hl-accelerator.f90"
|
||||
- "gtk-hl-infobar.f90"
|
||||
- "gtk-hl-assistant.f90"
|
||||
- "gtk-hl-misc.f90"
|
||||
- "gtk-draw-hl.f90"
|
||||
"gtk-sup.f90"
|
||||
- "gdk-pixbuf-hl.f90"
|
||||
"pango-auto.f90"
|
||||
"gdkevents-auto${GTKv}.f90"
|
||||
)
|
||||
|
||||
+if(NOT NO_BUILD_HL)
|
||||
+ set(sources ${sources}
|
||||
+ "gtk-hl.f90"
|
||||
+ "gtk-hl-container.f90"
|
||||
+ "gtk-hl-button.f90"
|
||||
+ "gtk-hl-entry.f90"
|
||||
+ "gtk-hl-tree.f90"
|
||||
+ "gtk-hl-menu.f90"
|
||||
+ "gtk-hl-combobox.f90"
|
||||
+ "gtk-hl-spin-slider.f90"
|
||||
+ "gtk-hl-chooser.f90"
|
||||
+ "gtk-hl-dialog.f90"
|
||||
+ "gtk-hl-progress.f90"
|
||||
+ "gtk-hl-accelerator.f90"
|
||||
+ "gtk-hl-infobar.f90"
|
||||
+ "gtk-hl-assistant.f90"
|
||||
+ "gtk-hl-misc.f90"
|
||||
+ "gtk-draw-hl.f90"
|
||||
+ "gdk-pixbuf-hl.f90"
|
||||
+ )
|
||||
+endif(NOT NO_BUILD_HL)
|
||||
+
|
||||
if (CMAKE_HOST_WIN32)
|
||||
set(sources
|
||||
${sources}
|
||||
@@ -1,79 +0,0 @@
|
||||
# Copyright 1999-2020 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/v${PV}.gtk3.24.8.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
S="${WORKDIR}/${P}.gtk3.24.8"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="doc examples high-level plplot"
|
||||
REQUIRED_USE="plplot? ( high-level )"
|
||||
|
||||
RDEPEND="
|
||||
x11-libs/gtk+:3
|
||||
plplot? ( >=sci-libs/plplot-5.13.0[cairo,fortran] )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
doc? ( app-doc/doxygen[dot] )
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
virtual/fortran
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
DOCS=( "README.md" "README-high-level" "CHANGELOG.md" )
|
||||
|
||||
pkg_setup() {
|
||||
fortran-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# Patching here because of failed via PATCHES due to different line endings in files.
|
||||
# Patch is disable building of 'gtkf-sketcher' - it isn't installed and has now documentation;
|
||||
# add upstream 'NO_BUILD_HL' cmake option to disable build of high-level interface to gtk-fortran
|
||||
# that is used by plplot interface (and gtkf-sketcher) and currently causes the TEXTREL QA warnings.
|
||||
eapply "${FILESDIR}"/gtk-fortran-NO_BUILD_HL-option.patch
|
||||
# Fix library installation path
|
||||
sed -i "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" CMakeLists.txt || die
|
||||
# Fix "Some or all of the gtk libraries were not found. (missing: GTK3_GDKCONFIG_INCLUDE_DIR)",
|
||||
# ref: https://github.com/vmagnin/gtk-fortran/commit/d3c1682
|
||||
sed -i "s:GTK3_GDKCONFIG gdkconfig.h:GTK3_GDKCONFIG gdk/gdkconfig.h:" cmake/FindGTK3.cmake || die
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile
|
||||
use doc && cmake_src_compile doxygen
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
use doc && dodoc -r "${BUILD_DIR}"/html && rm "${D}/usr/share/doc/${P}"/html/{*.map,*.md5}
|
||||
}
|
||||
@@ -10,7 +10,6 @@
|
||||
a cross-platform library to build Graphical User Interfaces.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="doc">Build doxygen documentation</flag>
|
||||
<flag name="examples">Install examples source code files</flag>
|
||||
<flag name="high-level">Build high-level interface to the gtk-fortran package</flag>
|
||||
<flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> support</flag>
|
||||
|
||||
Reference in New Issue
Block a user