* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/
@ 2018-01-13 8:15 Andrey Grozin
0 siblings, 0 replies; 6+ messages in thread
From: Andrey Grozin @ 2018-01-13 8:15 UTC (permalink / raw
To: gentoo-commits
commit: d886010781dc6f67ccf137b8e1397b225238793f
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 08:14:40 2018 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 08:14:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8860107
sci-visualization/gle: fix building with -std=c++14
Closes: https://bugs.gentoo.org/638876
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-visualization/gle/files/gle-4.2.5-c++14.patch | 27 ++++++++++++++++++++++
.../gle/files/gle-4.2.5-parallel.patch | 20 ++++++++++++++++
sci-visualization/gle/gle-4.2.5-r1.ebuild | 8 +++++--
3 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/sci-visualization/gle/files/gle-4.2.5-c++14.patch b/sci-visualization/gle/files/gle-4.2.5-c++14.patch
new file mode 100644
index 00000000000..b548816ae06
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.5-c++14.patch
@@ -0,0 +1,27 @@
+diff -r -U2 gle-graphics-4.2.5.orig/src/gle/fitcf.h gle-graphics-4.2.5/src/gle/fitcf.h
+--- gle-graphics-4.2.5.orig/src/gle/fitcf.h 2015-08-16 13:51:24.000000000 +0600
++++ gle-graphics-4.2.5/src/gle/fitcf.h 2018-01-13 13:57:23.140749391 +0700
+@@ -182,8 +182,8 @@
+ typedef struct Namelist Namelist;
+
+-#define abs(x) ((x) >= 0 ? (x) : -(x))
++/*#define abs(x) ((x) >= 0 ? (x) : -(x))*/
+ #define dabs(x) (doublereal)abs(x)
+-#define min(a,b) ((a) <= (b) ? (a) : (b))
+-#define max(a,b) ((a) >= (b) ? (a) : (b))
++/*#define min(a,b) ((a) <= (b) ? (a) : (b))*/
++/*#define max(a,b) ((a) >= (b) ? (a) : (b))*/
+ #define dmin(a,b) (doublereal)min(a,b)
+ #define dmax(a,b) (doublereal)max(a,b)
+diff -r -U2 gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp
+--- gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp 2015-08-16 13:51:24.000000000 +0600
++++ gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp 2018-01-13 14:08:08.169722265 +0700
+@@ -49,7 +49,7 @@
+ #include "f2c.h"
+ #else
+-#include "f2c.h"
+ #include <stdio.h>
+ #include <math.h>
++#include "f2c.h"
+ #endif
+
diff --git a/sci-visualization/gle/files/gle-4.2.5-parallel.patch b/sci-visualization/gle/files/gle-4.2.5-parallel.patch
new file mode 100644
index 00000000000..eeca1f5946b
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.5-parallel.patch
@@ -0,0 +1,20 @@
+diff -r -U2 gle-graphics-4.2.5.orig/src/gui/MakefileAC.in gle-graphics-4.2.5/src/gui/MakefileAC.in
+--- gle-graphics-4.2.5.orig/src/gui/MakefileAC.in 2015-08-16 13:51:24.000000000 +0600
++++ gle-graphics-4.2.5/src/gui/MakefileAC.in 2018-01-13 14:23:09.066684378 +0700
+@@ -83,12 +83,12 @@
+ $(QMAKE_PROG) $(QMAKE_OPTS)
+
+-domake:
+- $(MAKE_PROG)
++domake: Makefile
++ $(MAKE)
+
+-repmake:
++repmake: Makefile
+ perl ../../platform/autopackage/qt-replace.pl Makefile
+
+ doclean:
+- -$(MAKE_PROG) clean
++ -$(MAKE) clean
+ -@$(RM) qgle install_qgle_name_mac Makefile
+ -@$(RMDIR) moc
diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild
index b16b4ee3425..c9157c01809 100644
--- a/sci-visualization/gle/gle-4.2.5-r1.ebuild
+++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit eutils elisp-common flag-o-matic autotools
DESCRIPTION="Graphics Layout Engine"
@@ -30,8 +30,12 @@ RDEPEND="${DEPEND}
S="${WORKDIR}"/${MY_P}
+PATCHES=( "${FILESDIR}"/${P}-parallel.patch
+ "${FILESDIR}"/${P}-c++14.patch
+ )
+
src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.2.4b-parallel.patch
+ default
eaclocal
eautoconf
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/
@ 2019-04-11 20:49 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2019-04-11 20:49 UTC (permalink / raw
To: gentoo-commits
commit: bc9d0ab7531be52dcde085e832feac2f3a9b7e99
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 20:48:11 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 20:48:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc9d0ab7
sci-visualization/gle: Fix building with media-libs/jpeg
Closes: https://bugs.gentoo.org/647626
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../gle/files/gle-4.2.5-jpeg-9c.patch | 22 ++++++++++++++++++++++
sci-visualization/gle/gle-4.2.5-r1.ebuild | 10 ++++++----
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
new file mode 100644
index 00000000000..c5dd2205dc4
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/647626
+
+--- a/src/gle/gle-poppler.cpp
++++ b/src/gle/gle-poppler.cpp
+@@ -194,7 +194,7 @@
+ boolean gle_jpeg_empty_output_buffer(j_compress_ptr cinfo) {
+ gle_jpeg_term_destination(cinfo);
+ gle_jpeg_init_destination(cinfo);
+- return true;
++ return TRUE;
+ }
+
+ void gle_jpeg_memory_dest(j_compress_ptr cinfo, JOCTET* buffer, GLEWriteFuncAndClosure writeCallback) {
+@@ -237,7 +237,7 @@
+ cinfo.in_color_space = JCS_RGB;
+ }
+ jpeg_set_defaults(&cinfo);
+- jpeg_start_compress(&cinfo, true);
++ jpeg_start_compress(&cinfo, TRUE);
+ JSAMPROW row = new JSAMPLE[cinfo.input_components * width];
+ JSAMPROW row_pointer[1];
+ row_pointer[0] = row;
diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild
index c9157c01809..f0d2a19ba6a 100644
--- a/sci-visualization/gle/gle-4.2.5-r1.ebuild
+++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,9 +30,11 @@ RDEPEND="${DEPEND}
S="${WORKDIR}"/${MY_P}
-PATCHES=( "${FILESDIR}"/${P}-parallel.patch
- "${FILESDIR}"/${P}-c++14.patch
- )
+PATCHES=(
+ "${FILESDIR}"/${P}-parallel.patch
+ "${FILESDIR}"/${P}-c++14.patch
+ "${FILESDIR}"/${P}-jpeg-9c.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/
@ 2022-12-24 6:23 Andrey Grozin
0 siblings, 0 replies; 6+ messages in thread
From: Andrey Grozin @ 2022-12-24 6:23 UTC (permalink / raw
To: gentoo-commits
commit: acf10dea930bd45a1a70e4d72d698bff7f01a14a
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 06:22:45 2022 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 06:22:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf10dea
sci-visualization/gle: remove old revision
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-visualization/gle/files/gle-4.3.3.patch | 134 ----------------------------
sci-visualization/gle/gle-4.3.3-r2.ebuild | 84 -----------------
2 files changed, 218 deletions(-)
diff --git a/sci-visualization/gle/files/gle-4.3.3.patch b/sci-visualization/gle/files/gle-4.3.3.patch
deleted file mode 100644
index 22dc0b160605..000000000000
--- a/sci-visualization/gle/files/gle-4.3.3.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -r -U2 src.orig/CMakeLists.txt src/CMakeLists.txt
---- src.orig/CMakeLists.txt 2022-04-14 02:47:12.000000000 +0700
-+++ src/CMakeLists.txt 2022-12-20 13:03:11.386586253 +0700
-@@ -9,4 +9,7 @@
- project (gle VERSION 4.3.3)
-
-+set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+
- add_compile_definitions(GLEVN="${PROJECT_VERSION}")
- set( CMAKE_DEBUG_POSTFIX "d")
-@@ -130,5 +133,5 @@
- string(COMPARE NOTEQUAL "${CAIRO_LIBRARIES}" "CAIRO_LIBRARIES-NOTFOUND" CAIRO_FOUND)
- endif()
--find_path(CAIRO_INCLUDE_DIRS cairo.h PATHS ${CAIRO_ROOT} PATH_SUFFIXES include REQUIRED)
-+find_path(CAIRO_INCLUDE_DIRS cairo.h PATHS ${CAIRO_ROOT} PATH_SUFFIXES include include/cairo REQUIRED)
- if(CAIRO_FOUND)
- message("-- Found CAIRO: " ${CAIRO_LIBRARIES} )
-@@ -154,8 +157,8 @@
- endif()
- else()
-- find_library(PIXMAN_LIBRARIES NAMES pixman pixmand PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib REQUIRED)
-+ find_library(PIXMAN_LIBRARIES NAMES pixman pixmand pixman-1 PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib lib64 REQUIRED)
- string(COMPARE NOTEQUAL "${PIXMAN_LIBRARIES}" "PIXMAN_LIBRARIES-NOTFOUND" PIXMAN_FOUND)
- endif()
--find_path(PIXMAN_INCLUDE_DIRS pixman.h PATHS ${PIXMAN_ROOT} PATH_SUFFIXES include REQUIRED)
-+find_path(PIXMAN_INCLUDE_DIRS pixman.h PATHS ${PIXMAN_ROOT} PATH_SUFFIXES include include/pixman-1 REQUIRED)
- if(PIXMAN_FOUND)
- message("-- Found PIXMAN: " ${PIXMAN_LIBRARIES} )
-@@ -164,9 +167,9 @@
- # -- GHOSTscript or GHOSTPDL include directory only since gle links to installed version at runtime
- #
--find_path(GDIR1 iapi.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
-+find_path(GDIR1 iapi.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
- list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR1} )
--find_path(GDIR2 gdevdsp.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
-+find_path(GDIR2 gdevdsp.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
- list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR2} )
--find_path(GDIR3 gserrors.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
-+find_path(GDIR3 gserrors.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
- list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR3} )
-
-@@ -398,5 +401,4 @@
- # documentation file installation in doc folder
- install(FILES
-- ../doc/LICENSE.txt
- ../doc/README.txt
- ../doc/ChangeLog.txt
-diff -r -U2 src.orig/gui/CMakeLists.txt src/gui/CMakeLists.txt
---- src.orig/gui/CMakeLists.txt 2022-04-14 02:47:12.000000000 +0700
-+++ src/gui/CMakeLists.txt 2022-12-19 10:21:59.026388957 +0700
-@@ -54,11 +54,14 @@
- $<$<PLATFORM_ID:Windows>:qgle.rc>
- )
--# no jpeg as its contianed in Qt
-+# no jpeg as its contained in Qt
-+# but need to add JPEG for Debian!
-+# order matters: first static files (and libgle), then dynamic libraries
- target_link_libraries ( qgle LINK_PUBLIC
-+ libgle-graphics_s
- ${ZLIB_LIBRARIES}
-+ ${JPEG_LIBRARIES}
- ${TIFF_LIBRARIES}
- ${PNG_LIBRARIES}
- ${PIXMAN_LIBRARIES}
-- libgle-graphics_s
- Qt::Core
- Qt::Gui
-@@ -70,5 +73,6 @@
-
- if(UNIX AND NOT APPLE)
-- target_link_libraries ( qgle LINK_PUBLIC
-+ target_link_libraries ( qgle LINK_PUBLIC
-+ dl
- glut
- GLU
-diff -r -U2 src.orig/gui/main.cpp src/gui/main.cpp
---- src.orig/gui/main.cpp 2022-04-14 02:47:12.000000000 +0700
-+++ src/gui/main.cpp 2022-12-19 10:21:59.046388957 +0700
-@@ -277,5 +277,5 @@
- #endif
- #ifdef Q_OS_LINUX
-- Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
-+ // Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
- #endif
- QLocale curLocale("C");
-diff -r -U2 src.orig/gui/qgs.h src/gui/qgs.h
---- src.orig/gui/qgs.h 2022-04-14 02:47:12.000000000 +0700
-+++ src/gui/qgs.h 2022-12-19 10:21:59.068388958 +0700
-@@ -40,7 +40,7 @@
- #include "gsinc/ierrors.h"
- #else
--#include <ierrors.h>
--#include <iapi.h>
--#include <gdevdsp.h>
-+#include <ghostscript/ierrors.h>
-+#include <ghostscript/iapi.h>
-+#include <ghostscript/gdevdsp.h>
-
- #endif
-diff -r -U2 src.orig/makefmt/makefmt.cpp src/makefmt/makefmt.cpp
---- src.orig/makefmt/makefmt.cpp 2022-04-14 02:47:12.000000000 +0700
-+++ src/makefmt/makefmt.cpp 2022-12-18 14:09:54.399896247 +0700
-@@ -115,6 +115,6 @@
-
- int main(int argc, char *argv[]) {
-- char filename[80];
-- char fmtname[80];
-+ char filename[200];
-+ char fmtname[200];
- init_accents();
- /* encoding file given? */
-diff -r -U2 src.orig/TeX/CMakeLists.txt src/TeX/CMakeLists.txt
---- src.orig/TeX/CMakeLists.txt 2022-04-14 02:47:12.000000000 +0700
-+++ src/TeX/CMakeLists.txt 2022-12-20 13:34:00.953502995 +0700
-@@ -52,11 +52,11 @@
- )
- # make the inittex.ini in the install folder
--install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/gle$<$<CONFIG:Debug>:d> -mkinittex)")
-+# install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/gle$<$<CONFIG:Debug>:d> -mkinittex)")
- # explicity install inittex.ini for cpack even though its created in this directory
- # from gle -mkinittex command above
--install(FILES
-- ${CMAKE_INSTALL_PREFIX}/inittex.ini
-- CONFIGURATIONS Release Debug
-- DESTINATION .
--)
-+# install(FILES
-+# ${CMAKE_INSTALL_PREFIX}/inittex.ini
-+# CONFIGURATIONS Release Debug
-+# DESTINATION .
-+# )
-
-Только в src/TeX: CMakeLists.txt~
diff --git a/sci-visualization/gle/gle-4.3.3-r2.ebuild b/sci-visualization/gle/gle-4.3.3-r2.ebuild
deleted file mode 100644
index 63f5cc0125d8..000000000000
--- a/sci-visualization/gle/gle-4.3.3-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake elisp-common
-
-DESCRIPTION="Graphics Layout Engine"
-HOMEPAGE="http://glx.sourceforge.io/ https://github.com/vlabella/GLE/"
-IUSE="doc emacs"
-LIB_VERSION="d476418f006b001dc7f47dcafb413c0557fa44a7"
-SRC_URI="https://github.com/vlabella/GLE/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/vlabella/gle-library/archive/${LIB_VERSION}.tar.gz -> ${PN}-library.tar.gz
- doc? ( https://dev.gentoo.org/~grozin/gle-manual.pdf.gz )
- emacs? ( https://dev.gentoo.org/~grozin/gle-mode.el.gz )"
-S="${WORKDIR}"/GLE-${PV}/src
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="app-text/ghostscript-gpl
- dev-libs/boost
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-libs/freeglut
- media-libs/glu
- media-libs/libpng
- media-libs/tiff
- sys-libs/zlib
- media-libs/libjpeg-turbo
- x11-libs/cairo
- x11-libs/pixman
- emacs? ( app-editors/emacs:* )"
-RDEPEND="${DEPEND}
- virtual/latex-base"
-
-PATCHES=( "${FILESDIR}"/${P}.patch )
-SITEFILE="64${PN}-gentoo.el"
-
-src_configure() {
- local mycmakeargs=(
- -DGLE_EXAMPLES_LIBRARY_PATH="${WORKDIR}"/gle-library-${LIB_VERSION}
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use emacs && elisp-compile "${WORKDIR}"/*.el
-}
-
-src_install() {
- pushd "${WORKDIR}"/${P}_build > /dev/null || die "pushd failed"
- newbin gle/gle gle.bin
- dobin gui/qgle
- insinto /usr/share/${PN}
- doins gle/glerc
- doins -r gle/font
- popd > /dev/null
- newbin "${FILESDIR}"/gle.sh gle
- dodoc ../doc/README.txt ../doc/ChangeLog.txt
- doins TeX/init.tex
- mv "${WORKDIR}"/gle-library-${LIB_VERSION}/include "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc || die "mv failed"
- doins -r "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc
- GLE_TOP="${D}"/usr/share/${PN} "${D}"/usr/bin/gle.bin -mkinittex
- use doc && dodoc "${WORKDIR}"/*.pdf
- if use emacs; then
- elisp-install ${PN} "${WORKDIR}"/*.el "${WORKDIR}"/*.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/
@ 2023-05-14 10:29 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-05-14 10:29 UTC (permalink / raw
To: gentoo-commits
commit: 0bfba004e7ce52ca5071702176c7cd63b3d5093b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 07:25:45 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 10:27:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bfba004
sci-visualization/gle: drop 4.2.5-r4
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-visualization/gle/Manifest | 1 -
sci-visualization/gle/files/gle-4.2.5-c++14.patch | 27 ------
.../gle/files/gle-4.2.5-jpeg-9c.patch | 22 -----
.../gle/files/gle-4.2.5-parallel.patch | 20 ----
sci-visualization/gle/gle-4.2.5-r4.ebuild | 103 ---------------------
5 files changed, 173 deletions(-)
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 711e164a9042..725aa0b89bfe 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,6 +1,5 @@
DIST gle-4.3.3.tar.gz 1788614 BLAKE2B 3f608a8dad32d02b06808d5b2cfe4a2beb2c076c74e2972be2e94fe56bf24190b9cc7c69f45f1b02d399354f827c43722029871d6355bc0e4abe003f71b2bf82 SHA512 191dde025828f3376c7241e0580fcd459c743fe947f69cc3be1345b43c1d2587852a0d002dfdab7d8b7b45fd30e6bf4e8a4b5c73bcc2f3ce2fd08aa41d799b03
DIST gle-c++17.patch.gz 18738 BLAKE2B e0d91aedf2121897336be72d8ad5878be95cf15982b38efb2fda86605d6e0f01b792013a9ab6407692254e5c074630daede05bcf97f349541dd979b21eb2ff15 SHA512 3bc4e335577f94eafd140cd64f2ada1926b1679c113de1f0bb0dd1afed67210470340470b19d89dae4ae1ef433f05120332a465711afb4e637e3cf0c6db68ace
-DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
DIST gle-library.tar.gz 1073620 BLAKE2B 051f9584dbf3195c7598ae54b12ab8d373e8054e8ff4c3d1dfed70319c29c5cb8bb1f0baff127768bcf9e36e4f52be3b3238e786e1598d1cdfbd6d1af6d6bdd3 SHA512 af6a46f2bd945714679eb9d8ca4c70ca9a741cf6652590eb3a8d9422059f49ce3d2c33418c37899bd54f9e0bc0085ae82ffd2f2b84b77879e2f2d09a0026d12a
DIST gle-manual.pdf.gz 1878050 BLAKE2B 6ebd3c0214ab8aee3e5a32d1e1cdf1c001cd09325c80a506a1e41f4eb3ec8869b75083c741a5cf8b2f3faf1d2cb0c6cfeca835daa284263598f749109904cc11 SHA512 7cc796626fa19541558004250a4a5b206ead7ba704c76fd948693aca144e70926b8213ee8b062841bffedc631eb39a255d69387bbee4a5acc7edc6d093e3113f
DIST gle-mode.el.gz 7359 BLAKE2B bcbc61651f87f3ee1d079fc0a0de38788523a5ee33f56087b89f4e15b9ef5ee4010cf47679c38da3dfae1954ddbfee4728d10c0af6530f645ff63ab2b219da09 SHA512 c8d291c23f53346d8a44b7d95d737da88c6ec0af597fb8298a564a5567a9e9a0db658d14c3cb43157d58614e65cf2293eaeb01528a7a49722a2da07e16f940e1
diff --git a/sci-visualization/gle/files/gle-4.2.5-c++14.patch b/sci-visualization/gle/files/gle-4.2.5-c++14.patch
deleted file mode 100644
index b548816ae065..000000000000
--- a/sci-visualization/gle/files/gle-4.2.5-c++14.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -r -U2 gle-graphics-4.2.5.orig/src/gle/fitcf.h gle-graphics-4.2.5/src/gle/fitcf.h
---- gle-graphics-4.2.5.orig/src/gle/fitcf.h 2015-08-16 13:51:24.000000000 +0600
-+++ gle-graphics-4.2.5/src/gle/fitcf.h 2018-01-13 13:57:23.140749391 +0700
-@@ -182,8 +182,8 @@
- typedef struct Namelist Namelist;
-
--#define abs(x) ((x) >= 0 ? (x) : -(x))
-+/*#define abs(x) ((x) >= 0 ? (x) : -(x))*/
- #define dabs(x) (doublereal)abs(x)
--#define min(a,b) ((a) <= (b) ? (a) : (b))
--#define max(a,b) ((a) >= (b) ? (a) : (b))
-+/*#define min(a,b) ((a) <= (b) ? (a) : (b))*/
-+/*#define max(a,b) ((a) >= (b) ? (a) : (b))*/
- #define dmin(a,b) (doublereal)min(a,b)
- #define dmax(a,b) (doublereal)max(a,b)
-diff -r -U2 gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp
---- gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp 2015-08-16 13:51:24.000000000 +0600
-+++ gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp 2018-01-13 14:08:08.169722265 +0700
-@@ -49,7 +49,7 @@
- #include "f2c.h"
- #else
--#include "f2c.h"
- #include <stdio.h>
- #include <math.h>
-+#include "f2c.h"
- #endif
-
diff --git a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
deleted file mode 100644
index c5dd2205dc43..000000000000
--- a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/647626
-
---- a/src/gle/gle-poppler.cpp
-+++ b/src/gle/gle-poppler.cpp
-@@ -194,7 +194,7 @@
- boolean gle_jpeg_empty_output_buffer(j_compress_ptr cinfo) {
- gle_jpeg_term_destination(cinfo);
- gle_jpeg_init_destination(cinfo);
-- return true;
-+ return TRUE;
- }
-
- void gle_jpeg_memory_dest(j_compress_ptr cinfo, JOCTET* buffer, GLEWriteFuncAndClosure writeCallback) {
-@@ -237,7 +237,7 @@
- cinfo.in_color_space = JCS_RGB;
- }
- jpeg_set_defaults(&cinfo);
-- jpeg_start_compress(&cinfo, true);
-+ jpeg_start_compress(&cinfo, TRUE);
- JSAMPROW row = new JSAMPLE[cinfo.input_components * width];
- JSAMPROW row_pointer[1];
- row_pointer[0] = row;
diff --git a/sci-visualization/gle/files/gle-4.2.5-parallel.patch b/sci-visualization/gle/files/gle-4.2.5-parallel.patch
deleted file mode 100644
index eeca1f5946ba..000000000000
--- a/sci-visualization/gle/files/gle-4.2.5-parallel.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r -U2 gle-graphics-4.2.5.orig/src/gui/MakefileAC.in gle-graphics-4.2.5/src/gui/MakefileAC.in
---- gle-graphics-4.2.5.orig/src/gui/MakefileAC.in 2015-08-16 13:51:24.000000000 +0600
-+++ gle-graphics-4.2.5/src/gui/MakefileAC.in 2018-01-13 14:23:09.066684378 +0700
-@@ -83,12 +83,12 @@
- $(QMAKE_PROG) $(QMAKE_OPTS)
-
--domake:
-- $(MAKE_PROG)
-+domake: Makefile
-+ $(MAKE)
-
--repmake:
-+repmake: Makefile
- perl ../../platform/autopackage/qt-replace.pl Makefile
-
- doclean:
-- -$(MAKE_PROG) clean
-+ -$(MAKE) clean
- -@$(RM) qgle install_qgle_name_mac Makefile
- -@$(RMDIR) moc
diff --git a/sci-visualization/gle/gle-4.2.5-r4.ebuild b/sci-visualization/gle/gle-4.2.5-r4.ebuild
deleted file mode 100644
index 88e3c6d80dd6..000000000000
--- a/sci-visualization/gle/gle-4.2.5-r4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic
-
-MY_P=${PN}-graphics-${PV}
-
-DESCRIPTION="Graphics Layout Engine"
-HOMEPAGE="https://glx.sourceforge.net"
-SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2 emacs? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs jpeg png tiff vim-syntax X"
-
-DEPEND="
- sys-libs/ncurses:=
- emacs? ( >=app-editors/emacs-23.1:* )
- jpeg? ( media-libs/libjpeg-turbo:= )
- png? ( media-libs/libpng:= )
- tiff? ( media-libs/tiff:= )
- X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}
- app-text/ghostscript-gpl
- virtual/latex-base
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )"
-BDEPEND="doc? ( dev-texlive/texlive-latexextra )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-parallel.patch
- "${FILESDIR}"/${P}-c++14.patch
- "${FILESDIR}"/${P}-jpeg-9c.patch
-)
-
-src_prepare() {
- default
- eaclocal
- eautoconf
-}
-
-src_configure() {
- # CPPFLAGS are understood as C++ flags
- append-cppflags ${CXXFLAGS}
- append-cppflags -std=c++14
- econf \
- --without-rpath \
- --without-qt \
- --with-manip \
- $(use_with X x) \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff)
-}
-
-src_compile() {
- emake
- use doc && emake -j1 doc
-
- if use emacs; then
- cd contrib/editors/highlighting || die
- mv ${PN}-emacs.el ${PN}-mode.el || die
- elisp-compile ${PN}-mode.el
- fi
-}
-
-src_install() {
- # -jN failed to install some data files
- emake -j1 DESTDIR="${D}" install
- rm -rf "${ED}"/usr/share/doc/gle-graphics || die
- dodoc README.txt
-
- use doc && dodoc build/doc/gle-manual.pdf
-
- if use emacs; then
- elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc}
- elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el
- fi
-
- if use vim-syntax ; then
- dodir /usr/share/vim/vimfiles/{ftplugins,indent,syntax}
- cd contrib/editors/highlighting/vim || die
- chmod 644 ftplugin/* indent/* syntax/* || die
- insinto /usr/share/vim/vimfiles
- doins -r ftplugin indent syntax
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/
@ 2023-08-21 12:43 Andrey Grozin
0 siblings, 0 replies; 6+ messages in thread
From: Andrey Grozin @ 2023-08-21 12:43 UTC (permalink / raw
To: gentoo-commits
commit: 0da61ca1fcea2d4061ba1cb39addb6fadd90957a
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 12:43:41 2023 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 12:43:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da61ca1
sci-visualization/gle: bump to 4.3.4
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-visualization/gle/Manifest | 2 +
sci-visualization/gle/files/license.patch | 11 ++++
sci-visualization/gle/files/tiff.patch | 9 ++++
sci-visualization/gle/gle-4.3.4.ebuild | 84 +++++++++++++++++++++++++++++++
4 files changed, 106 insertions(+)
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 725aa0b89bfe..23bf1affc0e5 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,5 +1,7 @@
DIST gle-4.3.3.tar.gz 1788614 BLAKE2B 3f608a8dad32d02b06808d5b2cfe4a2beb2c076c74e2972be2e94fe56bf24190b9cc7c69f45f1b02d399354f827c43722029871d6355bc0e4abe003f71b2bf82 SHA512 191dde025828f3376c7241e0580fcd459c743fe947f69cc3be1345b43c1d2587852a0d002dfdab7d8b7b45fd30e6bf4e8a4b5c73bcc2f3ce2fd08aa41d799b03
+DIST gle-4.3.4.tar.gz 1791581 BLAKE2B a26fcafb3390fcf083a0d3008e22f3e998b71ba44f373fabf5feb8fd494fe8be8941e6f6118e1062b4ad4330a5e2e722b890edecaeba3a7640af954c7067b8d6 SHA512 5b59e0a51b466313b6ae53419137a25764f2b0c4eed8be217e30ba73245afbdbbd74228f5539b50f47dccfd5448be12b18ffa0e935a663bfd2073bb5d5eafeac
DIST gle-c++17.patch.gz 18738 BLAKE2B e0d91aedf2121897336be72d8ad5878be95cf15982b38efb2fda86605d6e0f01b792013a9ab6407692254e5c074630daede05bcf97f349541dd979b21eb2ff15 SHA512 3bc4e335577f94eafd140cd64f2ada1926b1679c113de1f0bb0dd1afed67210470340470b19d89dae4ae1ef433f05120332a465711afb4e637e3cf0c6db68ace
DIST gle-library.tar.gz 1073620 BLAKE2B 051f9584dbf3195c7598ae54b12ab8d373e8054e8ff4c3d1dfed70319c29c5cb8bb1f0baff127768bcf9e36e4f52be3b3238e786e1598d1cdfbd6d1af6d6bdd3 SHA512 af6a46f2bd945714679eb9d8ca4c70ca9a741cf6652590eb3a8d9422059f49ce3d2c33418c37899bd54f9e0bc0085ae82ffd2f2b84b77879e2f2d09a0026d12a
+DIST gle-manual.pdf 3950922 BLAKE2B 7151b88bdbcf55c6a23b2190cbc00d1cbec78c3026487337f0bbe2746b22ecf81f549b6e778fcf1f82adc6a71805f3ed7c45bda40328b86a56ef2b78c1fffc4d SHA512 78eef1e97bfbe1a1897b22b7650fba08e170708cf53adfd22cd432081497e2c5845534e43549e7fd5b9e3c9e7e1c937dbc0b64b35c5416ce4cf143c55e5a56a9
DIST gle-manual.pdf.gz 1878050 BLAKE2B 6ebd3c0214ab8aee3e5a32d1e1cdf1c001cd09325c80a506a1e41f4eb3ec8869b75083c741a5cf8b2f3faf1d2cb0c6cfeca835daa284263598f749109904cc11 SHA512 7cc796626fa19541558004250a4a5b206ead7ba704c76fd948693aca144e70926b8213ee8b062841bffedc631eb39a255d69387bbee4a5acc7edc6d093e3113f
DIST gle-mode.el.gz 7359 BLAKE2B bcbc61651f87f3ee1d079fc0a0de38788523a5ee33f56087b89f4e15b9ef5ee4010cf47679c38da3dfae1954ddbfee4728d10c0af6530f645ff63ab2b219da09 SHA512 c8d291c23f53346d8a44b7d95d737da88c6ec0af597fb8298a564a5567a9e9a0db658d14c3cb43157d58614e65cf2293eaeb01528a7a49722a2da07e16f940e1
diff --git a/sci-visualization/gle/files/license.patch b/sci-visualization/gle/files/license.patch
new file mode 100644
index 000000000000..05b44088f420
--- /dev/null
+++ b/sci-visualization/gle/files/license.patch
@@ -0,0 +1,11 @@
+diff -r -U3 src.orig/CMakeLists.txt src/CMakeLists.txt
+--- src.orig/CMakeLists.txt 2023-04-11 07:46:19.000000000 +0700
++++ src/CMakeLists.txt 2023-04-12 21:54:22.107770167 +0700
+@@ -461,7 +461,6 @@
+
+ # documentation file installation in doc folder
+ install(FILES
+- ../doc/LICENSE.txt
+ ../doc/README.txt
+ ../doc/ChangeLog.txt
+ CONFIGURATIONS Release Debug
diff --git a/sci-visualization/gle/files/tiff.patch b/sci-visualization/gle/files/tiff.patch
new file mode 100644
index 000000000000..98bdc2e018d8
--- /dev/null
+++ b/sci-visualization/gle/files/tiff.patch
@@ -0,0 +1,9 @@
+diff -r -U2 src.orig/gui/CMakeLists.txt src/gui/CMakeLists.txt
+--- src.orig/gui/CMakeLists.txt 2023-04-11 07:46:19.000000000 +0700
++++ src/gui/CMakeLists.txt 2023-08-21 13:00:21.039704497 +0700
+@@ -70,4 +70,5 @@
+ ${PNG_LIBRARIES}
+ ${PIXMAN_LIBRARIES}
++ TIFF::TIFF
+ Qt::Core
+ Qt::Gui
diff --git a/sci-visualization/gle/gle-4.3.4.ebuild b/sci-visualization/gle/gle-4.3.4.ebuild
new file mode 100644
index 000000000000..7602f290b544
--- /dev/null
+++ b/sci-visualization/gle/gle-4.3.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake elisp-common
+
+DESCRIPTION="Graphics Layout Engine"
+HOMEPAGE="http://glx.sourceforge.io/ https://github.com/vlabella/GLE/"
+IUSE="doc emacs"
+LIB_VERSION="d476418f006b001dc7f47dcafb413c0557fa44a7"
+SRC_URI="https://github.com/vlabella/GLE/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/vlabella/gle-library/archive/${LIB_VERSION}.tar.gz -> ${PN}-library.tar.gz
+ doc? ( https://github.com/vlabella/GLE/releases/download/v${PV}/gle-manual.pdf )
+ emacs? ( https://dev.gentoo.org/~grozin/gle-mode.el.gz )"
+S="${WORKDIR}"/GLE-${PV}/src
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="app-text/ghostscript-gpl
+ dev-libs/boost
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ media-libs/freeglut
+ media-libs/glu
+ media-libs/libpng
+ media-libs/tiff
+ sys-libs/zlib
+ media-libs/libjpeg-turbo
+ x11-libs/cairo
+ x11-libs/pixman
+ emacs? ( app-editors/emacs:* )"
+RDEPEND="${DEPEND}
+ virtual/latex-base"
+
+PATCHES=( "${FILESDIR}"/license.patch "${FILESDIR}"/tiff.patch )
+SITEFILE="64${PN}-gentoo.el"
+
+src_configure() {
+ local mycmakeargs=(
+ -DGLE_EXAMPLES_LIBRARY_PATH="${WORKDIR}"/gle-library-${LIB_VERSION}
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use emacs && elisp-compile "${WORKDIR}"/*.el
+}
+
+src_install() {
+ pushd "${WORKDIR}"/GLE-${PV}/src_build > /dev/null || die "pushd failed"
+ newbin gle/gle gle.bin
+ dobin gui/qgle
+ insinto /usr/share/${PN}
+ doins gle/glerc
+ doins -r gle/font
+ popd > /dev/null
+ newbin "${FILESDIR}"/gle.sh gle
+ dodoc ../doc/README.txt ../doc/ChangeLog.txt
+ doins TeX/init.tex
+ mv "${WORKDIR}"/gle-library-${LIB_VERSION}/include "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc || die "mv failed"
+ doins -r "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc
+ GLE_TOP="${D}"/usr/share/${PN} "${D}"/usr/bin/gle.bin -mkinittex
+ use doc && dodoc "${DISTDIR}"/*.pdf
+ if use emacs; then
+ elisp-install ${PN} "${WORKDIR}"/*.el "${WORKDIR}"/*.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/
@ 2023-08-22 8:39 Andrey Grozin
0 siblings, 0 replies; 6+ messages in thread
From: Andrey Grozin @ 2023-08-22 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 2141de0308768993d9d21770c828d0c7425ba8dd
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 08:39:31 2023 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 08:39:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2141de03
sci-visualization/gle: remove old versions
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-visualization/gle/Manifest | 4 --
sci-visualization/gle/files/array.patch | 15 ----
sci-visualization/gle/files/cairo-pixman.patch | 21 ------
sci-visualization/gle/files/ghostscript.patch | 16 -----
sci-visualization/gle/files/install.patch | 20 ------
sci-visualization/gle/files/lic.patch | 9 ---
sci-visualization/gle/files/link.patch | 20 ------
sci-visualization/gle/files/wayland.patch | 10 ---
sci-visualization/gle/gle-4.3.3-r3.ebuild | 94 --------------------------
sci-visualization/gle/gle-4.3.4.ebuild | 84 -----------------------
10 files changed, 293 deletions(-)
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 3628b91299a2..0bb3855bdcd3 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,8 +1,4 @@
-DIST gle-4.3.3.tar.gz 1788614 BLAKE2B 3f608a8dad32d02b06808d5b2cfe4a2beb2c076c74e2972be2e94fe56bf24190b9cc7c69f45f1b02d399354f827c43722029871d6355bc0e4abe003f71b2bf82 SHA512 191dde025828f3376c7241e0580fcd459c743fe947f69cc3be1345b43c1d2587852a0d002dfdab7d8b7b45fd30e6bf4e8a4b5c73bcc2f3ce2fd08aa41d799b03
DIST gle-4.3.4.pdf 3950922 BLAKE2B 7151b88bdbcf55c6a23b2190cbc00d1cbec78c3026487337f0bbe2746b22ecf81f549b6e778fcf1f82adc6a71805f3ed7c45bda40328b86a56ef2b78c1fffc4d SHA512 78eef1e97bfbe1a1897b22b7650fba08e170708cf53adfd22cd432081497e2c5845534e43549e7fd5b9e3c9e7e1c937dbc0b64b35c5416ce4cf143c55e5a56a9
DIST gle-4.3.4.tar.gz 1791581 BLAKE2B a26fcafb3390fcf083a0d3008e22f3e998b71ba44f373fabf5feb8fd494fe8be8941e6f6118e1062b4ad4330a5e2e722b890edecaeba3a7640af954c7067b8d6 SHA512 5b59e0a51b466313b6ae53419137a25764f2b0c4eed8be217e30ba73245afbdbbd74228f5539b50f47dccfd5448be12b18ffa0e935a663bfd2073bb5d5eafeac
-DIST gle-c++17.patch.gz 18738 BLAKE2B e0d91aedf2121897336be72d8ad5878be95cf15982b38efb2fda86605d6e0f01b792013a9ab6407692254e5c074630daede05bcf97f349541dd979b21eb2ff15 SHA512 3bc4e335577f94eafd140cd64f2ada1926b1679c113de1f0bb0dd1afed67210470340470b19d89dae4ae1ef433f05120332a465711afb4e637e3cf0c6db68ace
DIST gle-library.tar.gz 1073620 BLAKE2B 051f9584dbf3195c7598ae54b12ab8d373e8054e8ff4c3d1dfed70319c29c5cb8bb1f0baff127768bcf9e36e4f52be3b3238e786e1598d1cdfbd6d1af6d6bdd3 SHA512 af6a46f2bd945714679eb9d8ca4c70ca9a741cf6652590eb3a8d9422059f49ce3d2c33418c37899bd54f9e0bc0085ae82ffd2f2b84b77879e2f2d09a0026d12a
-DIST gle-manual.pdf 3950922 BLAKE2B 7151b88bdbcf55c6a23b2190cbc00d1cbec78c3026487337f0bbe2746b22ecf81f549b6e778fcf1f82adc6a71805f3ed7c45bda40328b86a56ef2b78c1fffc4d SHA512 78eef1e97bfbe1a1897b22b7650fba08e170708cf53adfd22cd432081497e2c5845534e43549e7fd5b9e3c9e7e1c937dbc0b64b35c5416ce4cf143c55e5a56a9
-DIST gle-manual.pdf.gz 1878050 BLAKE2B 6ebd3c0214ab8aee3e5a32d1e1cdf1c001cd09325c80a506a1e41f4eb3ec8869b75083c741a5cf8b2f3faf1d2cb0c6cfeca835daa284263598f749109904cc11 SHA512 7cc796626fa19541558004250a4a5b206ead7ba704c76fd948693aca144e70926b8213ee8b062841bffedc631eb39a255d69387bbee4a5acc7edc6d093e3113f
DIST gle-mode.el.gz 7359 BLAKE2B bcbc61651f87f3ee1d079fc0a0de38788523a5ee33f56087b89f4e15b9ef5ee4010cf47679c38da3dfae1954ddbfee4728d10c0af6530f645ff63ab2b219da09 SHA512 c8d291c23f53346d8a44b7d95d737da88c6ec0af597fb8298a564a5567a9e9a0db658d14c3cb43157d58614e65cf2293eaeb01528a7a49722a2da07e16f940e1
diff --git a/sci-visualization/gle/files/array.patch b/sci-visualization/gle/files/array.patch
deleted file mode 100644
index 54b7676aea88..000000000000
--- a/sci-visualization/gle/files/array.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r -U2 src.orig/makefmt/makefmt.cpp src/makefmt/makefmt.cpp
---- src.orig/makefmt/makefmt.cpp 2022-04-14 02:47:12.000000000 +0700
-+++ src/makefmt/makefmt.cpp 2022-12-18 14:09:54.399896247 +0700
-@@ -115,6 +115,6 @@
-
- int main(int argc, char *argv[]) {
-- char filename[80];
-- char fmtname[80];
-+ char filename[200];
-+ char fmtname[200];
- init_accents();
- /* encoding file given? */
-diff -r -U2 src.orig/TeX/CMakeLists.txt src/TeX/CMakeLists.txt
---- src.orig/TeX/CMakeLists.txt 2022-04-14 02:47:12.000000000 +0700
-+++ src/TeX/CMakeLists.txt 2022-12-20 13:34:00.953502995 +0700
diff --git a/sci-visualization/gle/files/cairo-pixman.patch b/sci-visualization/gle/files/cairo-pixman.patch
deleted file mode 100644
index e5b34eb287f9..000000000000
--- a/sci-visualization/gle/files/cairo-pixman.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -r -U2 src.orig/CMakeLists.txt src/CMakeLists.txt
---- src.orig/CMakeLists.txt 2022-04-14 02:47:12.000000000 +0700
-+++ src/CMakeLists.txt 2022-12-20 13:03:11.386586253 +0700
-@@ -130,5 +133,5 @@
- string(COMPARE NOTEQUAL "${CAIRO_LIBRARIES}" "CAIRO_LIBRARIES-NOTFOUND" CAIRO_FOUND)
- endif()
--find_path(CAIRO_INCLUDE_DIRS cairo.h PATHS ${CAIRO_ROOT} PATH_SUFFIXES include REQUIRED)
-+find_path(CAIRO_INCLUDE_DIRS cairo.h PATHS ${CAIRO_ROOT} PATH_SUFFIXES include include/cairo REQUIRED)
- if(CAIRO_FOUND)
- message("-- Found CAIRO: " ${CAIRO_LIBRARIES} )
-@@ -154,8 +157,8 @@
- endif()
- else()
-- find_library(PIXMAN_LIBRARIES NAMES pixman pixmand PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib REQUIRED)
-+ find_library(PIXMAN_LIBRARIES NAMES pixman pixmand pixman-1 PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib REQUIRED)
- string(COMPARE NOTEQUAL "${PIXMAN_LIBRARIES}" "PIXMAN_LIBRARIES-NOTFOUND" PIXMAN_FOUND)
- endif()
--find_path(PIXMAN_INCLUDE_DIRS pixman.h PATHS ${PIXMAN_ROOT} PATH_SUFFIXES include REQUIRED)
-+find_path(PIXMAN_INCLUDE_DIRS pixman.h PATHS ${PIXMAN_ROOT} PATH_SUFFIXES include include/pixman-1 REQUIRED)
- if(PIXMAN_FOUND)
- message("-- Found PIXMAN: " ${PIXMAN_LIBRARIES} )
diff --git a/sci-visualization/gle/files/ghostscript.patch b/sci-visualization/gle/files/ghostscript.patch
deleted file mode 100644
index 576477ca17c3..000000000000
--- a/sci-visualization/gle/files/ghostscript.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r -U2 src.orig/CMakeLists.txt src/CMakeLists.txt
---- src.orig/CMakeLists.txt 2022-04-14 02:47:12.000000000 +0700
-+++ src/CMakeLists.txt 2022-12-20 13:03:11.386586253 +0700
-@@ -164,9 +167,9 @@
- # -- GHOSTscript or GHOSTPDL include directory only since gle links to installed version at runtime
- #
--find_path(GDIR1 iapi.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
-+find_path(GDIR1 iapi.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
- list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR1} )
--find_path(GDIR2 gdevdsp.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
-+find_path(GDIR2 gdevdsp.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
- list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR2} )
--find_path(GDIR3 gserrors.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
-+find_path(GDIR3 gserrors.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
- list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR3} )
-
diff --git a/sci-visualization/gle/files/install.patch b/sci-visualization/gle/files/install.patch
deleted file mode 100644
index b4a82f5548f6..000000000000
--- a/sci-visualization/gle/files/install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r -U2 src.orig/TeX/CMakeLists.txt src/TeX/CMakeLists.txt
---- src.orig/TeX/CMakeLists.txt 2022-04-14 02:47:12.000000000 +0700
-+++ src/TeX/CMakeLists.txt 2022-12-20 13:34:00.953502995 +0700
-@@ -52,11 +52,11 @@
- )
- # make the inittex.ini in the install folder
--install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/gle$<$<CONFIG:Debug>:d> -mkinittex)")
-+# install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/gle$<$<CONFIG:Debug>:d> -mkinittex)")
- # explicity install inittex.ini for cpack even though its created in this directory
- # from gle -mkinittex command above
--install(FILES
-- ${CMAKE_INSTALL_PREFIX}/inittex.ini
-- CONFIGURATIONS Release Debug
-- DESTINATION .
--)
-+# install(FILES
-+# ${CMAKE_INSTALL_PREFIX}/inittex.ini
-+# CONFIGURATIONS Release Debug
-+# DESTINATION .
-+# )
diff --git a/sci-visualization/gle/files/lic.patch b/sci-visualization/gle/files/lic.patch
deleted file mode 100644
index 3bfa54a1de65..000000000000
--- a/sci-visualization/gle/files/lic.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -r -U2 src.orig/CMakeLists.txt src/CMakeLists.txt
---- src.orig/CMakeLists.txt 2022-04-14 02:47:12.000000000 +0700
-+++ src/CMakeLists.txt 2022-12-20 13:03:11.386586253 +0700
-@@ -398,5 +401,4 @@
- # documentation file installation in doc folder
- install(FILES
-- ../doc/LICENSE.txt
- ../doc/README.txt
- ../doc/ChangeLog.txt
diff --git a/sci-visualization/gle/files/link.patch b/sci-visualization/gle/files/link.patch
deleted file mode 100644
index b565670cbd09..000000000000
--- a/sci-visualization/gle/files/link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r -U2 src.orig/gui/CMakeLists.txt src/gui/CMakeLists.txt
---- src.orig/gui/CMakeLists.txt 2022-04-14 02:47:12.000000000 +0700
-+++ src/gui/CMakeLists.txt 2022-12-19 10:21:59.026388957 +0700
-@@ -54,11 +54,14 @@
- $<$<PLATFORM_ID:Windows>:qgle.rc>
- )
--# no jpeg as its contianed in Qt
-+# no jpeg as its contained in Qt
-+# but need to add JPEG for Linux!
-+# order matters: first static files (and libgle), then dynamic libraries
- target_link_libraries ( qgle LINK_PUBLIC
-+ libgle-graphics_s
- ${ZLIB_LIBRARIES}
-+ ${JPEG_LIBRARIES}
- ${TIFF_LIBRARIES}
- ${PNG_LIBRARIES}
- ${PIXMAN_LIBRARIES}
-- libgle-graphics_s
- Qt::Core
- Qt::Gui
diff --git a/sci-visualization/gle/files/wayland.patch b/sci-visualization/gle/files/wayland.patch
deleted file mode 100644
index acdbc43a08bc..000000000000
--- a/sci-visualization/gle/files/wayland.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 src.orig/gui/main.cpp src/gui/main.cpp
---- src.orig/gui/main.cpp 2022-04-14 02:47:12.000000000 +0700
-+++ src/gui/main.cpp 2022-12-19 10:21:59.046388957 +0700
-@@ -277,5 +277,5 @@
- #endif
- #ifdef Q_OS_LINUX
-- Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
-+ // Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
- #endif
- QLocale curLocale("C");
diff --git a/sci-visualization/gle/gle-4.3.3-r3.ebuild b/sci-visualization/gle/gle-4.3.3-r3.ebuild
deleted file mode 100644
index 5c2be2635c7d..000000000000
--- a/sci-visualization/gle/gle-4.3.3-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake elisp-common
-
-DESCRIPTION="Graphics Layout Engine"
-HOMEPAGE="http://glx.sourceforge.io/ https://github.com/vlabella/GLE/"
-IUSE="doc emacs"
-LIB_VERSION="d476418f006b001dc7f47dcafb413c0557fa44a7"
-SRC_URI="https://github.com/vlabella/GLE/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/vlabella/gle-library/archive/${LIB_VERSION}.tar.gz -> ${PN}-library.tar.gz
- https://dev.gentoo.org/~grozin/gle-c++17.patch.gz
- doc? ( https://dev.gentoo.org/~grozin/gle-manual.pdf.gz )
- emacs? ( https://dev.gentoo.org/~grozin/gle-mode.el.gz )"
-S="${WORKDIR}"/GLE-${PV}/src
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="app-text/ghostscript-gpl
- dev-libs/boost
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-libs/freeglut
- media-libs/glu
- media-libs/libpng
- media-libs/tiff
- sys-libs/zlib
- media-libs/libjpeg-turbo
- x11-libs/cairo
- x11-libs/pixman
- emacs? ( app-editors/emacs:* )"
-RDEPEND="${DEPEND}
- virtual/latex-base"
-
-PATCHES=( \
- "${WORKDIR}"/${PN}-c++17.patch \
- "${FILESDIR}"/cairo-pixman.patch \
- "${FILESDIR}"/ghostscript.patch \
- "${FILESDIR}"/link.patch \
- "${FILESDIR}"/array.patch \
- "${FILESDIR}"/wayland.patch \
- "${FILESDIR}"/install.patch \
- "${FILESDIR}"/lic.patch \
- )
-SITEFILE="64${PN}-gentoo.el"
-
-src_configure() {
- local mycmakeargs=(
- -DGLE_EXAMPLES_LIBRARY_PATH="${WORKDIR}"/gle-library-${LIB_VERSION}
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use emacs && elisp-compile "${WORKDIR}"/*.el
-}
-
-src_install() {
- pushd "${WORKDIR}"/${P}_build > /dev/null || die "pushd failed"
- newbin gle/gle gle.bin
- dobin gui/qgle
- insinto /usr/share/${PN}
- doins gle/glerc
- doins -r gle/font
- popd > /dev/null
- newbin "${FILESDIR}"/gle.sh gle
- dodoc ../doc/README.txt ../doc/ChangeLog.txt
- doins TeX/init.tex
- mv "${WORKDIR}"/gle-library-${LIB_VERSION}/include "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc || die "mv failed"
- doins -r "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc
- GLE_TOP="${D}"/usr/share/${PN} "${D}"/usr/bin/gle.bin -mkinittex
- use doc && dodoc "${WORKDIR}"/*.pdf
- if use emacs; then
- elisp-install ${PN} "${WORKDIR}"/*.el "${WORKDIR}"/*.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/sci-visualization/gle/gle-4.3.4.ebuild b/sci-visualization/gle/gle-4.3.4.ebuild
deleted file mode 100644
index 7602f290b544..000000000000
--- a/sci-visualization/gle/gle-4.3.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake elisp-common
-
-DESCRIPTION="Graphics Layout Engine"
-HOMEPAGE="http://glx.sourceforge.io/ https://github.com/vlabella/GLE/"
-IUSE="doc emacs"
-LIB_VERSION="d476418f006b001dc7f47dcafb413c0557fa44a7"
-SRC_URI="https://github.com/vlabella/GLE/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/vlabella/gle-library/archive/${LIB_VERSION}.tar.gz -> ${PN}-library.tar.gz
- doc? ( https://github.com/vlabella/GLE/releases/download/v${PV}/gle-manual.pdf )
- emacs? ( https://dev.gentoo.org/~grozin/gle-mode.el.gz )"
-S="${WORKDIR}"/GLE-${PV}/src
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="app-text/ghostscript-gpl
- dev-libs/boost
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-libs/freeglut
- media-libs/glu
- media-libs/libpng
- media-libs/tiff
- sys-libs/zlib
- media-libs/libjpeg-turbo
- x11-libs/cairo
- x11-libs/pixman
- emacs? ( app-editors/emacs:* )"
-RDEPEND="${DEPEND}
- virtual/latex-base"
-
-PATCHES=( "${FILESDIR}"/license.patch "${FILESDIR}"/tiff.patch )
-SITEFILE="64${PN}-gentoo.el"
-
-src_configure() {
- local mycmakeargs=(
- -DGLE_EXAMPLES_LIBRARY_PATH="${WORKDIR}"/gle-library-${LIB_VERSION}
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use emacs && elisp-compile "${WORKDIR}"/*.el
-}
-
-src_install() {
- pushd "${WORKDIR}"/GLE-${PV}/src_build > /dev/null || die "pushd failed"
- newbin gle/gle gle.bin
- dobin gui/qgle
- insinto /usr/share/${PN}
- doins gle/glerc
- doins -r gle/font
- popd > /dev/null
- newbin "${FILESDIR}"/gle.sh gle
- dodoc ../doc/README.txt ../doc/ChangeLog.txt
- doins TeX/init.tex
- mv "${WORKDIR}"/gle-library-${LIB_VERSION}/include "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc || die "mv failed"
- doins -r "${WORKDIR}"/gle-library-${LIB_VERSION}/gleinc
- GLE_TOP="${D}"/usr/share/${PN} "${D}"/usr/bin/gle.bin -mkinittex
- use doc && dodoc "${DISTDIR}"/*.pdf
- if use emacs; then
- elisp-install ${PN} "${WORKDIR}"/*.el "${WORKDIR}"/*.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-22 8:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-21 12:43 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/ Andrey Grozin
-- strict thread matches above, loose matches on Subject: below --
2023-08-22 8:39 Andrey Grozin
2023-05-14 10:29 Andreas Sturmlechner
2022-12-24 6:23 Andrey Grozin
2019-04-11 20:49 David Seifert
2018-01-13 8:15 Andrey Grozin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox