diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-24 08:01:36 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-24 08:01:36 +0000 |
commit | 1cf3f23200484257eaf7d863e323e7e9aee98d2b (patch) | |
tree | 90c6263d1ca4d504601d8df05db598f5737b07ce /sci-visualization/gle/files | |
parent | 4583148f2657a7a66fd68b25c9fab02be110c989 (diff) |
gentoo auto-resync : 24:12:2022 - 08:01:36
Diffstat (limited to 'sci-visualization/gle/files')
-rw-r--r-- | sci-visualization/gle/files/array.patch | 15 | ||||
-rw-r--r-- | sci-visualization/gle/files/cairo-pixman.patch | 21 | ||||
-rw-r--r-- | sci-visualization/gle/files/ghostscript.patch | 16 | ||||
-rw-r--r-- | sci-visualization/gle/files/gle-4.3.3.patch | 134 | ||||
-rw-r--r-- | sci-visualization/gle/files/install.patch | 20 | ||||
-rw-r--r-- | sci-visualization/gle/files/lic.patch | 9 | ||||
-rw-r--r-- | sci-visualization/gle/files/link.patch | 20 | ||||
-rw-r--r-- | sci-visualization/gle/files/wayland.patch | 10 |
8 files changed, 111 insertions, 134 deletions
diff --git a/sci-visualization/gle/files/array.patch b/sci-visualization/gle/files/array.patch new file mode 100644 index 000000000000..54b7676aea88 --- /dev/null +++ b/sci-visualization/gle/files/array.patch @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000000..e5b34eb287f9 --- /dev/null +++ b/sci-visualization/gle/files/cairo-pixman.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 000000000000..576477ca17c3 --- /dev/null +++ b/sci-visualization/gle/files/ghostscript.patch @@ -0,0 +1,16 @@ +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/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/files/install.patch b/sci-visualization/gle/files/install.patch new file mode 100644 index 000000000000..b4a82f5548f6 --- /dev/null +++ b/sci-visualization/gle/files/install.patch @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000000..3bfa54a1de65 --- /dev/null +++ b/sci-visualization/gle/files/lic.patch @@ -0,0 +1,9 @@ +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 new file mode 100644 index 000000000000..b565670cbd09 --- /dev/null +++ b/sci-visualization/gle/files/link.patch @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000000..acdbc43a08bc --- /dev/null +++ b/sci-visualization/gle/files/wayland.patch @@ -0,0 +1,10 @@ +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"); |