From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF15D158020 for ; Sat, 24 Dec 2022 06:23:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24878E087A; Sat, 24 Dec 2022 06:23:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01782E087A for ; Sat, 24 Dec 2022 06:23:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E258D340D92 for ; Sat, 24 Dec 2022 06:23:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C54A7CC for ; Sat, 24 Dec 2022 06:23:03 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1671862965.acf10dea930bd45a1a70e4d72d698bff7f01a14a.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gle/files/gle-4.3.3.patch sci-visualization/gle/gle-4.3.3-r2.ebuild X-VCS-Directories: sci-visualization/gle/ sci-visualization/gle/files/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: acf10dea930bd45a1a70e4d72d698bff7f01a14a X-VCS-Branch: master Date: Sat, 24 Dec 2022 06:23:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ed90053e-548f-4830-ac9a-b13f8a9279ea X-Archives-Hash: e1375ecfc556145ad791dd997d96d988 commit: acf10dea930bd45a1a70e4d72d698bff7f01a14a Author: Andrey Grozin gentoo org> AuthorDate: Sat Dec 24 06:22:45 2022 +0000 Commit: Andrey Grozin gentoo 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 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 @@ - $<$: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 --#include --#include -+#include -+#include -+#include - - #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$<$:d> -mkinittex)") -+# install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/gle$<$: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 -}