From 1cf3f23200484257eaf7d863e323e7e9aee98d2b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Dec 2022 08:01:36 +0000 Subject: gentoo auto-resync : 24:12:2022 - 08:01:36 --- sci-visualization/Manifest.gz | Bin 5368 -> 5379 bytes sci-visualization/gle/Manifest | 11 +- 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/gle-4.3.3.patch | 134 ------------------------- 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-r2.ebuild | 84 ---------------- sci-visualization/gle/gle-4.3.3-r3.ebuild | 94 +++++++++++++++++ 12 files changed, 214 insertions(+), 220 deletions(-) create mode 100644 sci-visualization/gle/files/array.patch create mode 100644 sci-visualization/gle/files/cairo-pixman.patch create mode 100644 sci-visualization/gle/files/ghostscript.patch delete mode 100644 sci-visualization/gle/files/gle-4.3.3.patch create mode 100644 sci-visualization/gle/files/install.patch create mode 100644 sci-visualization/gle/files/lic.patch create mode 100644 sci-visualization/gle/files/link.patch create mode 100644 sci-visualization/gle/files/wayland.patch delete mode 100644 sci-visualization/gle/gle-4.3.3-r2.ebuild create mode 100644 sci-visualization/gle/gle-4.3.3-r3.ebuild (limited to 'sci-visualization') diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz index 5a67cac19f17..be137ef731f5 100644 Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest index 83e146ae0d9f..95d5003da312 100644 --- a/sci-visualization/gle/Manifest +++ b/sci-visualization/gle/Manifest @@ -1,14 +1,21 @@ AUX 64gle-gentoo.el 191 BLAKE2B 710428a55c0c17baded6cec2b0d4a20582fc3a91278f27ee0724d911c01178e3474339ac6615aefef0a76d7bcb586fe7f9957fd2bd718d636d899891a60d1613 SHA512 6b363700fde1022963b81a274d1798f3ddcdd6e8472d802cc192bdbfe0c63bc2e0889f6d92e58964ccbc463f51b1fb6fab504951f74f203546ce79d38bb14d7c +AUX array.patch 581 BLAKE2B 9f7eba9c7ff8496059ad24cdda171f745db58a145d661338f5f3bf76c7863c2d1af8f879409f330ee6a163042fc0eb2f102e9857a2d15f9fcb06eb61a0394d61 SHA512 fa9760e4a07efb8c3fba372a9c11edeed06c563e9742001d388d2083f93b4b64f6e5e2ddef64372566630cfff9c59292455baf30bbbae5c0d7f426860ad1195b +AUX cairo-pixman.patch 1178 BLAKE2B b38c5ed332bf13b366df23277d999e648d67e861a4f227e14be6e6e448fb86b57a26c10d9909a25f2a45105a01f57a99cf1cdf75ffea66dca0bf3cc6e9dc6124 SHA512 52c9b2e538111f84a1f127717d3c96d75bb4cf138547fe97dfbbf563d06e50e92963d045b2396c01f83e48190638b9007843e51d6afe345e9404402fba5e307e +AUX ghostscript.patch 972 BLAKE2B 3750321b5093400595070290c9c9af948eae797e6365be982c82716000a5176df641888783d99b640014f9d5310c94c9c1ebbd3ac091ca4076b7b92b923a78b3 SHA512 063bb97c177e4c47d51649056cc30aa14a5f7df664e19a15b8bd5d337b14a5ad4f5d318301fcc33823aed9cf5b5af070949861c0ce8f857f59a6f7ba951a1d88 AUX gle-4.2.5-c++14.patch 1113 BLAKE2B a75d450b3f067d3f1158618fbdbed69352e9660a60662de730a73b5c7917f1f64a6a2c10472a7f4ba8ae49f8860ba72e919385b863de74878933e3c8022e246b SHA512 aef210745cbf2deb265fde3839e5156eadd52d28029583b52bb53a9e2db26f6dfc6fd2243626be67ae6d00b1e0dbd1b03ed32f594541a569b1df289e78d8d367 AUX gle-4.2.5-jpeg-9c.patch 685 BLAKE2B bfcb90439c6cdd2bd75b9e5d30232dd816f348dfdf9ee7067e848741c4050a441869e04513ae04f92569ad3854a77fe9c739be6ebd1ca5ff5988af6ba5020d99 SHA512 55c1f8fd59cbe71b14d1755bceb5fb02ebfbf0e71eafc39837b513ba48be7421c51352c60d127fc4744628eb6e403eadb703bf24a49dea5652c08ae749a67590 AUX gle-4.2.5-parallel.patch 572 BLAKE2B 03617a63dac035582a90cd0d872c114cc8b4426e05483130ead443a6d136f7c54cafabd7312e0c8eae5c90b704bd4d0a475f49feea69de464deba2c47970c066 SHA512 95d2c9fb1023f6f468b7258c52c04635dfe297da579de0bf429d90bfc1849348191f0821f18b048057271260ad0a9511fd811bdb1494fe51aa1dcd84276b2259 -AUX gle-4.3.3.patch 5101 BLAKE2B 0723a4de8465efeac456e0f0adc850618ea115480ef3b8301ea0df9d4aa572fe308fa10177141c8fdbd4d3f2b3d8b7d9ff2394aac58ee95380b253a70923c1c2 SHA512 c633d0da43993f7e8de3127b29f8e8e37b9130610cfb0ee3b7c2aed2c12c4ee036275c550ec396b02c84886abf835e2d98c0e124ceec09d79c0501c50a23fc04 AUX gle.sh 65 BLAKE2B 8e045866b0d20a77e3e2de050d90f0b0f8efa3a57481ecf2b01ad3c0f81d5ecd9e4d054b20ca488f282dbd111b6997113232fc984d628d9d9b60e3287511b912 SHA512 90ca83947538d2342702ea60974780a3f303c223989a43f5fe117b5d97b650827d074adcd011a15c0716b3a9cd54913a661ebe59a3afba06d51e0a889f14fda8 +AUX install.patch 821 BLAKE2B b8ca829a3e5f3fa96695ba28ff7e7170badc5a3f8f629a91cc6f2f16db5a5b3c0b18cb5c361e96f449304cc793d8e14f93c2c06b5ec7e27649662f1daad9f554 SHA512 1d22cdb507e3322c61bc69ef8ce12b32a9b58a2c6b634b7282d795e5ab66a10d19525e15351dee6a2ec136773ab28952de87cd10216c0acb782f2f441a3dcddd +AUX lic.patch 329 BLAKE2B 75445082d509836f3ff7d5c88c182486d2fdeb22cba77a96ee879073b5e6865ae2522978ef73f715f11cda323d51bb763e4189eca8aab213e4dafeaf6b33a4f3 SHA512 858b7dc4a226a48d3ee5692ab58db5975f202ffe1a885eb0e5272c359d3f9020fd38b9ccf2f1d605f90b6d749dc1674650e020d7eac99b4a4bfd808c47ee0052 +AUX link.patch 635 BLAKE2B bf4f93fae6dd7d8a14b3f6bd180a1e275511087fc3b8acd7c8b2a14fb5c163f884696a5dcc98bd11825c2e03ad65b1c2f1a695dbeae7f50cb555000fb3803474 SHA512 5d4e3255a066cbf4d442a778064edddaae007176420734b516b52d924573d23041128a99139a58be1cb5c2e858e6bb9b3a6f1ae81f8b9b823ffd8417547fb0d0 +AUX wayland.patch 347 BLAKE2B e4bff5717aee0ea83a7fdb7047a0363c34a225809246f33b7da92b9f535d9e412047bdb9e22436629bbc7b11be55838e64f624e870c4f60f4634d28aac21e3d7 SHA512 a51b030de9ffc7fd83e04271a191ba352cfd670a149249c0bf6415d4583c8402a4cc6930aa849bbab2d8c11f4934f21ffdba36c8fc78ba235ced6e2b9ca0b03d 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 EBUILD gle-4.2.5-r4.ebuild 2167 BLAKE2B 0a2d82e70c113d95e22620ccc4689a2cc361226fe044fc59a8635866ccaab62c475d9947aef9586c38e0173ba3ee86626f9db44ff83689c816000f9234991462 SHA512 5adcc01b7eae8c4e796ff32efeb74fc46b4ee2ff27f2145653012d2e1d1fac99c97216b8735409d73524da1f4850f5d4f3958e0b0d762103ad479626973d39a8 -EBUILD gle-4.3.3-r2.ebuild 2181 BLAKE2B 9fa56d4601c76f42459d629d72d97d5a69fe6d94170518b18772dc748696fcccad26a0ab3deddf81ee708930898b87469645dd04af822b33443e274a06cc17de SHA512 87771c3ad90220c25feaaef9839319e30618463ba1f68f90598543951920d6a1bcd19fe7fedba549f1ec7cdeac04fb21246fad22ee32ac9416079fa8cf5bf3f5 +EBUILD gle-4.3.3-r3.ebuild 2469 BLAKE2B 14d223de9a2bee0d41f9f48efc97d38458268bd6ca84c31806786ee3187c2b6ef836bb038eaaa6e49fb5b551fe7ca5e0fcd13bb31aca7ddea5dfdf11a1cbc697 SHA512 34e00d60b5bc676d76d7c91dd89e2e56378ff28273ef7926ece9a2538c4ac2b04908957041fc165a58bb6f1914bb7cae872a9e9a44172fe7a5542ba934a370ad MISC metadata.xml 758 BLAKE2B ea6e049fe37e4fc4cc9510774bb13ec9d2107ca1e4078a9bf22afadb59a375ced01aab6cffc674bcce01e4e51960db830e7a381600322f903f6b1407cd11ae13 SHA512 953fa5de474729f4196392b9ccb09d9a07799c26d5e5ef3422bc8e737bb666c8bd66e1931c225d049e30be31fc427909225d5457b95c78de2f2073d0108d2620 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 @@ - $<$: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/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$<$: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 . ++# ) 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 @@ + $<$: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"); 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 -} diff --git a/sci-visualization/gle/gle-4.3.3-r3.ebuild b/sci-visualization/gle/gle-4.3.3-r3.ebuild new file mode 100644 index 000000000000..5c2be2635c7d --- /dev/null +++ b/sci-visualization/gle/gle-4.3.3-r3.ebuild @@ -0,0 +1,94 @@ +# 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 +} -- cgit v1.2.3