diff options
Diffstat (limited to 'media-gfx')
31 files changed, 249 insertions, 323 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 5420256ea923..a2c70567b401 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 69f40745f913..3bd117139d39 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -1,9 +1,5 @@ AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86 AUX asy-ftd.vim 60 BLAKE2B 2ef690e6c1906378872aff97ed956b0c8fd1cf2e492787edd3bbd928d50724eec7b5b65f2b1b70c83e520b849c1cfe1539dcc7aabb0f8ba38b448ef58f36b802 SHA512 f4b62341f1482386d3e402f9d70a0f6b4c103a412a63dd8947aa45a5d43f12970902615b6c13e8cd8123f1cd44bf72e4204118d3bcfa7969fce078924bf150fd -AUX asymptote-2.32-configure-ac.patch 1124 BLAKE2B a915db606d72409cafafaa1246e02a55db0113d802adbe744cb3796a680b56e1a1224b194b3a9f920fff1d50af4e6547fcfac40e8663500201f102561a4dd778 SHA512 507b66175d69c43fe58cf7a856336c461f9b7a0f09edae99ac6cbeb648f1d5f1881a6a2aa1f6a12a90d381aff787e2e0a955a1a342b47aedb8b415e1498c9347 -AUX asymptote-2.32-ghostscript-9.15.patch 906 BLAKE2B 2edf7acac5da0d81fec831de1342d09887225937c1750b9a5fed62ca6c6a0e4d3fb014972f27f180c6b15e94620667d7e25b98e9b08ff3934ef14830d125ee1d SHA512 d5d40d10cead93f73755599aeb0177e65c9d34855b9889cdd603d7334c771b53132acc46c199c872d46b66f541f31326fe5747cd2cc60529b5051cf29e09d904 -AUX asymptote-2.32-info.patch 436 BLAKE2B 58e6c585d297c494ababaa805bf4afc300c78b3ca9fc861864c8a1f7c44b6eabfe0a74ce0f2f8f4d7ebc9a93aa7682e405085b3501066b58791c6bbff757bce1 SHA512 55283a8103625f1aee32ed3b8b235ff4af6350a2879a9c1289779a9a37ab0d76446dd3b17b731e9e1b8d1bb1c5e37c6c738eb193f00df89ef22b08b084e2ae36 -AUX asymptote-2.32-xdg-utils.patch 744 BLAKE2B 65e09817c8cda0711d76e5921a17e8702c16f2275b0d3a421f7b06fbbc932d48a4dde093c39dc03225c8ca90b533d8905f46722fc5aeffe5fd775c1bf39e6a8c SHA512 972be61509145f61537a0b8eab79a7f3b5f866e790bf9b18066235c906ed29621cd32dd0d894458221f3fb2c28ab67199139ba7f8e4753d2b20d5f1f07435b9b AUX asymptote-2.41-configure-ac.patch 475 BLAKE2B fbc6e09ab9bfba21bd0deb6cf12514307b826b9f85d42b44b427667f57db63bcbd4ca64cda502da2ed1110bd133968e2e95e0289b1179d126fcc7c4a1e55e79e SHA512 39403fbd218ca5a6c3a565e6f1955467c8e11296c69acfe529aca5566e03bfee395c360746288fe09d768c2cabd46faaa6efcb7e57595f0dc784b4ef2e0c416a AUX asymptote-2.41-info.patch 436 BLAKE2B 71987cc6fa4df197bed0dca7d4df27058ce28732cf8aea6a58f9bbd83e378757569bc39aa6fe0ff14f5dfbf7044e4f4ad27014814c318bb7a4993f9aafac761e SHA512 7d3ae35b2eb2b226ae3b7326d2e7d50524402d49be90303035a2872b5a109bb104f53376b9da681cc8d6922ddadec6a606540842745109edd3b55ce50725a6fb AUX asymptote-2.41-perl-5.26.patch 400 BLAKE2B 68d346f18f4021ac486dc06dd9dde7e118acb3050284e5aac8a5ef33baaed43a06bacbaaa0a75b0a49a7b8d03f7af65c8daf759d7a9e13b152ad6f7946a7a5df SHA512 bb333f4f42063be1c4a19d4cfd4209ac7b7d3c4318a5c3634581d63af2183cc27918b80e47148b1cbc256049b38cb85982ef7e00f7f021be3e714adabf15c87b diff --git a/media-gfx/asymptote/files/asymptote-2.32-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.32-configure-ac.patch deleted file mode 100644 index 597e915539be..000000000000 --- a/media-gfx/asymptote/files/asymptote-2.32-configure-ac.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: asymptote-2.32/configure.ac -=================================================================== ---- asymptote-2.32.orig/configure.ac -+++ asymptote-2.32/configure.ac -@@ -158,7 +158,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then - fi - CPPFLAGS_SAVE=$CPPFLAGS - CPPFLAGS=$CPPFLAGS" $INCL" -- AC_CHECK_HEADER(gc.h, -+ AC_CHECK_HEADER([gc/gc.h], - AC_CHECK_LIB([gc],[GC_malloc],[ - LIBS=$LIBS"-lgc " - AC_MSG_NOTICE([enabling system $GCNAME])],[ -@@ -232,7 +232,17 @@ AC_MSG_ERROR([*** Please install libm on - AC_CHECK_LIB([z], [deflate],, - AC_MSG_ERROR([*** Please install libz or zlib-devel on your system ***])) - AX_PTHREAD --AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]) -+ -+AC_ARG_WITH(sigsegv, -+ [ --with-sigsegv use libsigsegv], -+ [with_sigsegv=$withval], -+ [with_sigsegv="no"]) -+if test "$with_sigsegv" = "yes"; then -+AC_CHECK_HEADER([sigsegv.h], -+ AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]), -+ AC_MSG_NOTICE([*** Header file sigsegv.h not found ***])) -+fi -+ - AC_CHECK_LIB([rt], [sched_yield]) - - AC_ARG_ENABLE(readline, diff --git a/media-gfx/asymptote/files/asymptote-2.32-ghostscript-9.15.patch b/media-gfx/asymptote/files/asymptote-2.32-ghostscript-9.15.patch deleted file mode 100644 index aa826c5c251f..000000000000 --- a/media-gfx/asymptote/files/asymptote-2.32-ghostscript-9.15.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r -U2 asymptote-2.32.orig/runlabel.in asymptote-2.32/runlabel.in ---- asymptote-2.32.orig/runlabel.in 2014-05-22 23:11:47.000000000 +0700 -+++ asymptote-2.32/runlabel.in 2015-01-11 21:41:30.268889133 +0600 -@@ -112,5 +112,5 @@ - const string null="/dev/null"; - #endif -- cmd.push_back("-sDEVICE=epswrite"); -+ cmd.push_back("-sDEVICE=eps2write"); - cmd.push_back("-sOutputFile="+null); - cmd.push_back(stripDir(psname)); -@@ -310,5 +310,5 @@ - cmd.push_back("-dBATCH"); - if(safe) cmd.push_back("-dSAFER"); -- cmd.push_back("-sDEVICE=epswrite"); -+ cmd.push_back("-sDEVICE=eps2write"); - cmd.push_back("-sOutputFile=-"); - cmd.push_back(pdfname); -@@ -399,5 +399,5 @@ - cmd2.push_back("-P"); - if(safe) cmd2.push_back("-dSAFER"); -- cmd2.push_back("-sDEVICE=epswrite"); -+ cmd2.push_back("-sDEVICE=eps2write"); - cmd2.push_back("-sOutputFile=-"); - cmd2.push_back("-"); diff --git a/media-gfx/asymptote/files/asymptote-2.32-info.patch b/media-gfx/asymptote/files/asymptote-2.32-info.patch deleted file mode 100644 index 8a1e3f464231..000000000000 --- a/media-gfx/asymptote/files/asymptote-2.32-info.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: asymptote-2.32/doc/asymptote.texi -=================================================================== ---- asymptote-2.32.orig/doc/asymptote.texi -+++ asymptote-2.32/doc/asymptote.texi -@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir - - @dircategory Languages - @direntry --* asymptote: (asymptote/asymptote). Vector graphics language. -+* asymptote: (asymptote). Vector graphics language. - @end direntry - - @titlepage diff --git a/media-gfx/asymptote/files/asymptote-2.32-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.32-xdg-utils.patch deleted file mode 100644 index 2ac59e59f058..000000000000 --- a/media-gfx/asymptote/files/asymptote-2.32-xdg-utils.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: asymptote-2.32/settings.cc -=================================================================== ---- asymptote-2.32.orig/settings.cc -+++ asymptote-2.32/settings.cc -@@ -90,15 +90,15 @@ bool msdos=false; - string HOME="HOME"; - string docdir=ASYMPTOTE_DOCDIR; - const char pathSeparator=':'; --string defaultPSViewer="gv"; -+string defaultPSViewer="xdg-open"; - #ifdef __APPLE__ - string defaultPDFViewer="open"; - #else --string defaultPDFViewer="acroread"; -+string defaultPDFViewer="xdg-open"; - #endif - string defaultGhostscript="gs"; - string defaultGhostscriptLibrary="/usr/lib/libgs.so"; --string defaultDisplay="display"; -+string defaultDisplay="xdg-open"; - string defaultAnimate="animate"; - void queryRegistry() {} - const string dirsep="/"; diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 23b9fc5ba056..ab48e775be4d 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -3,7 +3,7 @@ DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b91 DIST darktable-2.4.0.tar.xz 3387972 BLAKE2B 9583dfac379430d21de798da922f747e066e237b87cc5f1f5934fad9cede181f1817ef451ddcb7790ca632d78c577d6651cd301083cbf1342003d9f413b31c4d SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20 EBUILD darktable-2.2.4.ebuild 3861 BLAKE2B 425ceb4384274b4a8c59b2aca784097c7171a3e871c5816b8c6905ec4edf02299372ffc227103a20b9895fcb8a285f7ccb19c0098273183db906b9cac7e9a7c2 SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556 -EBUILD darktable-2.2.5.ebuild 3862 BLAKE2B dc3cce68a860e0f2f9cea2b10be8b502f9e5a52d570e6e3caf5f22ac152a332db84bbec973cdc3c87864b9c28415feb2a87062f531bb2be0c129ef051ad42e8e SHA512 fc529bb16959bde798d850483b751915e7725a8fad68949720c4cd8f7b47f855c6e4487fa2b431ffd647684fcfd97ca64de55f121062b66ffd3b944957e8def5 +EBUILD darktable-2.2.5.ebuild 3861 BLAKE2B 425ceb4384274b4a8c59b2aca784097c7171a3e871c5816b8c6905ec4edf02299372ffc227103a20b9895fcb8a285f7ccb19c0098273183db906b9cac7e9a7c2 SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556 EBUILD darktable-2.4.0.ebuild 3942 BLAKE2B 259f0c9865fd8ba394a79ba5adf333d7e8f3ff3cba9a56a838d1a734821b90f6f91932bb57d33885c10f9cd27b1081eda8f44e72a31a48d5d95ccc590c0634a1 SHA512 2b68258a47c4ed8a66793385c7daf809688c36c7547ffc6684f60c19410235652c9e3c5175b1e3f96c92981c3fe56ddac283cb6cf3a85d912ec487d577be8e40 EBUILD darktable-9999.ebuild 3296 BLAKE2B 9a1410977c2093469a7324098787189364cf5bdd7b6e67c415dd54b608dc2db6f7bc7efe591f907c66a32600e5d5329022d1bcd539c6a5bdc8c14c5f23c3254f SHA512 2c04ee7ccc6a191bbeb0a75212e027838f6a5f4cdeeeff5ac638cd36cbf10e221d0d0a4ff58344723c8694b01dfde4c2774ba51d54a9c19c61565180fd8d6a62 MISC metadata.xml 1001 BLAKE2B 7da2598419c82747ec5d95f1454c86ac276ee2df931c4e61d0f6c1b52e112d1f49944ed0c1fb7dc8d7390d1fab5117cf734e6a1fec70d31af01d28c9c50d580e SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88 diff --git a/media-gfx/darktable/darktable-2.2.5.ebuild b/media-gfx/darktable/darktable-2.2.5.ebuild index 9e05606a2225..6c47755767e9 100644 --- a/media-gfx/darktable/darktable-2.2.5.ebuild +++ b/media-gfx/darktable/darktable-2.2.5.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P LICENSE="GPL-3 CC-BY-3.0" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk" # TODO add lua once dev-lang/lua-5.2 is unmasked IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 65909b3c01c9..5189b45afe33 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,4 +1,3 @@ -AUX digikam-5.5.0-cmake-3.9.patch 7298 BLAKE2B d4c9085b9d65977dad1932cbd57f132c8aee844827d28dd74b4ab3ce8dea199ce959306f56064f5abe0a6acaad11c2c45f3932444bda79bb72520ab68c240320 SHA512 0a0f33f8b288fc98b95397ff615ab747bb78e35f8b6ed517e814dfebd32dd3f626f0c232d5b45a69bf80c4b548b72932fb376ce2308b0786b196e7fcdeda9b19 AUX digikam-5.7.0-kcalcore-1.patch 1489 BLAKE2B af340a573d5cff28ef6d7fe91564ff858d3f55d0a641e05cbaf2428b3bd6351f04fd09a69bfa27d1b6e17e6ba2576571914923ceef84c4920e549d254af03886 SHA512 da3b1bd9586757174333fcfba927ef6d91e0b45813eaf5e9cde5d1062f1154fc6449b1fb746dbac2ddc05ba5c92ca162198fb6a4e36789786d81179c56770e29 AUX digikam-5.7.0-kcalcore-2.patch 3221 BLAKE2B 6bd179c65797444a4ddbc133c9a1e3204b8127acd360bdb18a766ecaecc0d8efd5284686c424379c8a80010135f0f1653c4efacd83500018da9724bcce1f1db3 SHA512 1f3b9434a53ac0d6111c8b3c306b30515684ab09eca2f8794cdcf21639af6e8148da881c4fb0fcf5aacb4531be35c1ecf51ee2ee7bb6fde9013736e04ec0f66d AUX digikam-5.7.0-kreadconfig5.patch 1068 BLAKE2B 4a19e8c0806e7d4ba6219711385db7865507414203f4a273114e1ece3e62983f36cac3b299c3d498a6118dd608719d18ad1c29d1d66bf4774151f530fcb08e01 SHA512 cc78a318f865a85c5a1b0a89734c6c320367c961313db1f8acac25a340c481aa79154ae0c21683f967e0042008235ccf5c9a28078d359c07aaa3e4244b543871 diff --git a/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch b/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch deleted file mode 100644 index d87096a6024e..000000000000 --- a/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch +++ /dev/null @@ -1,170 +0,0 @@ -commit 7e00441c257e7e9e5dc5ab983fc06046fb72b0c5 -Author: Gilles Caulier <caulier.gilles@gmail.com> -Date: Sat Jul 22 15:46:08 2017 +0200 - - fix broken linking stage under MacOS with macports. - move database models into libdigikamdatabase. - Let's others model in place to be included into libdigikamcore - -diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt -index 7d055363fb..a431a36d7b 100644 ---- a/libs/database/CMakeLists.txt -+++ b/libs/database/CMakeLists.txt -@@ -13,6 +13,18 @@ endif (POLICY CMP0063) - # Boost uses operator names (and, not, ...) - string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - -+set(libdatabasemodels_SRCS -+ models/imagemodel.cpp -+ models/imagefiltermodel.cpp -+ models/imagefiltermodelpriv.cpp -+ models/imagefiltermodelthreads.cpp -+ models/imagefiltersettings.cpp -+ models/imagelistmodel.cpp -+ models/imagesortsettings.cpp -+ models/imagethumbnailmodel.cpp -+ models/imageversionsmodel.cpp -+) -+ - set(libdatabasecore_SRCS - server/databaseserverstarter.cpp - server/databaseservererror.cpp -@@ -152,10 +164,10 @@ if(ENABLE_DBUS) - include_directories($<TARGET_PROPERTY:Qt5::DBus,INTERFACE_INCLUDE_DIRECTORIES>) - endif() - --add_library(digikamdatabase_src OBJECT ${digikamdatabase_LIB_SRCS}) -+add_library(digikamdatabase_src OBJECT ${digikamdatabase_LIB_SRCS} ${libdatabasemodels_SRCS}) - add_library(digikamdatabasemain_src OBJECT ${libdatabaseutils_SRCS} ${libimgqsort_SRCS}) - add_library(digikamdatabasecore_src OBJECT ${libdatabasecore_SRCS}) --add_library(digikamdatabase SHARED $<TARGET_OBJECTS:digikamdatabase_src> $<TARGET_OBJECTS:digikamdatabasemodels_src>) -+add_library(digikamdatabase $<TARGET_OBJECTS:digikamdatabase_src>) - - generate_export_header(digikamdatabase - BASE_NAME digikam_database -diff --git a/libs/models/imagefiltermodel.cpp b/libs/database/models/imagefiltermodel.cpp -similarity index 100% -rename from libs/models/imagefiltermodel.cpp -rename to libs/database/models/imagefiltermodel.cpp -diff --git a/libs/models/imagefiltermodel.h b/libs/database/models/imagefiltermodel.h -similarity index 100% -rename from libs/models/imagefiltermodel.h -rename to libs/database/models/imagefiltermodel.h -diff --git a/libs/models/imagefiltermodelpriv.cpp b/libs/database/models/imagefiltermodelpriv.cpp -similarity index 100% -rename from libs/models/imagefiltermodelpriv.cpp -rename to libs/database/models/imagefiltermodelpriv.cpp -diff --git a/libs/models/imagefiltermodelpriv.h b/libs/database/models/imagefiltermodelpriv.h -similarity index 100% -rename from libs/models/imagefiltermodelpriv.h -rename to libs/database/models/imagefiltermodelpriv.h -diff --git a/libs/models/imagefiltermodelthreads.cpp b/libs/database/models/imagefiltermodelthreads.cpp -similarity index 100% -rename from libs/models/imagefiltermodelthreads.cpp -rename to libs/database/models/imagefiltermodelthreads.cpp -diff --git a/libs/models/imagefiltermodelthreads.h b/libs/database/models/imagefiltermodelthreads.h -similarity index 100% -rename from libs/models/imagefiltermodelthreads.h -rename to libs/database/models/imagefiltermodelthreads.h -diff --git a/libs/models/imagefiltersettings.cpp b/libs/database/models/imagefiltersettings.cpp -similarity index 100% -rename from libs/models/imagefiltersettings.cpp -rename to libs/database/models/imagefiltersettings.cpp -diff --git a/libs/models/imagefiltersettings.h b/libs/database/models/imagefiltersettings.h -similarity index 100% -rename from libs/models/imagefiltersettings.h -rename to libs/database/models/imagefiltersettings.h -diff --git a/libs/models/imagelistmodel.cpp b/libs/database/models/imagelistmodel.cpp -similarity index 100% -rename from libs/models/imagelistmodel.cpp -rename to libs/database/models/imagelistmodel.cpp -diff --git a/libs/models/imagelistmodel.h b/libs/database/models/imagelistmodel.h -similarity index 100% -rename from libs/models/imagelistmodel.h -rename to libs/database/models/imagelistmodel.h -diff --git a/libs/models/imagemodel.cpp b/libs/database/models/imagemodel.cpp -similarity index 100% -rename from libs/models/imagemodel.cpp -rename to libs/database/models/imagemodel.cpp -diff --git a/libs/models/imagemodel.h b/libs/database/models/imagemodel.h -similarity index 100% -rename from libs/models/imagemodel.h -rename to libs/database/models/imagemodel.h -diff --git a/libs/models/imagesortsettings.cpp b/libs/database/models/imagesortsettings.cpp -similarity index 100% -rename from libs/models/imagesortsettings.cpp -rename to libs/database/models/imagesortsettings.cpp -diff --git a/libs/models/imagesortsettings.h b/libs/database/models/imagesortsettings.h -similarity index 100% -rename from libs/models/imagesortsettings.h -rename to libs/database/models/imagesortsettings.h -diff --git a/libs/models/imagethumbnailmodel.cpp b/libs/database/models/imagethumbnailmodel.cpp -similarity index 100% -rename from libs/models/imagethumbnailmodel.cpp -rename to libs/database/models/imagethumbnailmodel.cpp -diff --git a/libs/models/imagethumbnailmodel.h b/libs/database/models/imagethumbnailmodel.h -similarity index 100% -rename from libs/models/imagethumbnailmodel.h -rename to libs/database/models/imagethumbnailmodel.h -diff --git a/libs/models/imageversionsmodel.cpp b/libs/database/models/imageversionsmodel.cpp -similarity index 100% -rename from libs/models/imageversionsmodel.cpp -rename to libs/database/models/imageversionsmodel.cpp -diff --git a/libs/models/imageversionsmodel.h b/libs/database/models/imageversionsmodel.h -similarity index 100% -rename from libs/models/imageversionsmodel.h -rename to libs/database/models/imageversionsmodel.h -diff --git a/libs/models/CMakeLists.txt b/libs/models/CMakeLists.txt -index cbabfaa9b8..804456b955 100644 ---- a/libs/models/CMakeLists.txt -+++ b/libs/models/CMakeLists.txt -@@ -9,18 +9,6 @@ if (POLICY CMP0063) - cmake_policy(SET CMP0063 NEW) - endif (POLICY CMP0063) - --set(libdatabasemodels_SRCS -- imagemodel.cpp -- imagefiltermodel.cpp -- imagefiltermodelpriv.cpp -- imagefiltermodelthreads.cpp -- imagefiltersettings.cpp -- imagelistmodel.cpp -- imagesortsettings.cpp -- imagethumbnailmodel.cpp -- imageversionsmodel.cpp --) -- - set(libalbummodels_SRCS - imagealbummodel.cpp - imagealbumfiltermodel.cpp -@@ -52,5 +40,4 @@ endif() - #for digikam core lib - add_library(digikamgenericmodels_src OBJECT ${libgenericmodels_SRCS}) - --add_library(digikamdatabasemodels_src OBJECT ${libdatabasemodels_SRCS}) --add_library(digikammodels_src OBJECT ${libalbummodels_SRCS} ${libgenericmodels_SRCS}) -+add_library(digikammodels_src OBJECT ${libalbummodels_SRCS} ${libgenericmodels_SRCS}) - -From c51043283aa9d2612b88afe0146f0d63c77b08ed Mon Sep 17 00:00:00 2001 -From: Simon Frei <freisim93@gmail.com> -Date: Wed, 2 Aug 2017 12:12:55 +0200 -Subject: cmake: Fix warning: Remove ECMPackageConfigHelpers (unused) - ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2aaf56b..9a48492 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,7 +80,6 @@ include(ECMAddTests) - include(ECMMarkNonGuiExecutable) - include(ECMGenerateHeaders) - include(ECMGeneratePriFile) --include(ECMPackageConfigHelpers) - include(ECMSetupVersion) - include(ECMInstallIcons) - include(ECMAddAppIcon) --- -cgit v0.11.2 diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 1b1d8c048ce8..4362e1a67d1e 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -6,6 +6,6 @@ DIST GraphicsMagick-1.3.26.tar.xz 5400564 BLAKE2B bd7c5286f4ff0abe8fafee680f9bea DIST GraphicsMagick-1.3.27.tar.xz 5412544 BLAKE2B 130ce964f3745f4a9f3b54180529fb45afb4ecc63ecb88f626fa4dd2c6fb54675ff9b5b79527dc89d375cad5c4f1136063e612d91cc9d69b0c330c32c786fd96 SHA512 27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c EBUILD graphicsmagick-1.3.25.ebuild 3162 BLAKE2B 19d028a23bdd7cac5c21934e478b5f4b7bf6abec8e4fb81963719bdb9b2c891352d95cf727999ae08b12bd12b56bb1426c30ae4e1b10bbdcb46eeef015c016fd SHA512 ec889b617290ea3163b25be55260dffc754867db2f730104de45b465e90ad31550fd451c813d52dc611e66f5a2639e5d4923e48e25a5ca49ccd8797183385c32 EBUILD graphicsmagick-1.3.26.ebuild 3275 BLAKE2B 86e28c2249ac008c44142aa589e23e768a60d402853c5047daa09d761f4c541926a61b6b9b85fb62a56a6dd2dfddff30df09439b0bfd1c228e4aebec357158d5 SHA512 a28b4b47c1d4c7860be37b8480ecca5055008157969f208878c951068ab901cded604370663154c95f742c011a98554ac67e1f97a8e0b3a052cc01c8cb6a6696 -EBUILD graphicsmagick-1.3.27.ebuild 3328 BLAKE2B f5d875ab2453ac54f0b14167e0dfe3f50b4a0ff1ded2abe46f99e0af64bee2d4323f51cef2cc9c3f7446d2e9ed8d05c66a8e604ee946075786aae02e23e084d9 SHA512 f332bfdbc0d195f829911013de959a9990e53349ee223b695f624a286411ec0557c4132ceb1703dec79e634adda7bec9d3cb2ffb86ed238f39b8bde5e884ee5c +EBUILD graphicsmagick-1.3.27.ebuild 3327 BLAKE2B f58c75b68aeaf325688b93e617977fbc15f4faf3b3ba86a25f365186df0dba0dc19da10d54a42e15ca4f8752c81d64728f188be194661b8ae094dc29985040a4 SHA512 0042f9aee698b806addd5cbb71702c9b1ae9605c6ca80a1e6265f5d68e96e83a670ed5ea724bd9fd6510ede816765464099e2f8ee47d782497db0b1d10009731 EBUILD graphicsmagick-9999.ebuild 3283 BLAKE2B 7601699987f34923ca2dfa74b7a91584bf62a4c68c07761d77229522a10726450ae8821c3b5fcacbf5e4c8cb62e525d41763ca55c7082f41c9894104a0024495 SHA512 361ebf78cf28c28073a786931e0470e8bbf0da188edd5c9b68e51d1c3cf04916ead74e743b9fd8e5980bb9de37c4d639c5c32fc630665d55e6fc9c4717a15480 MISC metadata.xml 1220 BLAKE2B 991045c4a8f2fa2c7d71b585b88af2a0e0d4d260ca64b67131a096f9948272365e2d7303a7fbd5faf6da2bf952645061462ec8d643f14f301d0a12c37dd5f849 SHA512 1bb5a109f05ee51df889358ceb97669aaaa75356390ff85b7ad2ea7659fcc4cf7ad811b2795121ff9957ad58f27fd47dfaf792e0d5afbe31d84cf755158c66fd diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild index 8c694d25b729..c6d5b784810b 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" fi IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index da8de3a8f75b..3e6a0af1d0a5 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -13,11 +13,11 @@ EBUILD imagemagick-6.9.9.0.ebuild 5158 BLAKE2B da4cadafcda858bb14d298662fa44abae EBUILD imagemagick-6.9.9.18.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 EBUILD imagemagick-6.9.9.20.ebuild 5120 BLAKE2B b02f1bdfe05aa3a9f96bdc3596b785326753f5249bf5b19ba70a6a76ad1dfddb453acdacef7ee3d1c80bb75017912e73b9650fe5fad688620fdaadb01d87574a SHA512 f7e5492163118e23d46829613a8bd380faee2e2c6e597b1fcde7f7a1684c80a45ad0bab4b39deac083b4136cedc789c128fb6809c824469bef66c3a904738422 EBUILD imagemagick-6.9.9.23.ebuild 5122 BLAKE2B 16f53dfb31f82f636b577bb12069741b81c2fa91e5d0db9cf8e04d4f1056a6327cb465dd2206d3ea817a0b5a0a1f42ba14d05b82736a3b98cc1ccabbd8db4c3b SHA512 65388e8d87b190ef90fbd009794442778d4faf242f9589d988db156417d769e6f7239fb0b1bcaf972952796c438431860567c3b6c64e41d72759d03770014113 -EBUILD imagemagick-6.9.9.26.ebuild 5122 BLAKE2B 200e92749e4e2c8cf6df7876311bd21222d0be83f32487ca2ac0fe09db5d7e66654e35bb8ff70eeecc4538e720f636ef6f8c922f5f97f78c9b1a2ae5874ce3af SHA512 560b7611668b440f8e07f8892fc1572bcbaed36209e65d35172a9be87366c57d714a458db9b0416daeb7547eb9a623c0405628f3082c67eca2bd9e29b089c423 +EBUILD imagemagick-6.9.9.26.ebuild 5121 BLAKE2B ccb3b66edf072c65fb3360f9c4ee8b7e3e65ab23ac5502e2f731e4d40cef171b97e3ce0d50290e87c8e53315839ff9b6d1983d2b212b11ef08044b89dcda84f6 SHA512 d6bb36535a4f40b9b0c1a1b34d13c94e4a002802e2a7572edf95b20b95ae1336428f5cbc46dce98cc924e42dedc258b96d5d586f6d5b14cd7197efcab47cc73e EBUILD imagemagick-6.9.9.9.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 EBUILD imagemagick-7.0.6.9.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 EBUILD imagemagick-7.0.7.11.ebuild 5128 BLAKE2B 283c66b5aadd9c405bb9fea2a51d4fb952793a8834ae0f55fe049c73633835c5de1f2acbe9d82a5e78218bad6b54240c113d408eda547c09fa6ce2f80cd2fe36 SHA512 e404fa7e419da2c4b191b5a348e6dc6dc843d4543742f60328ebc7dfe93f4fd487915223ae90a408c3a0c298ffc48cf4775718e61eb7c7298f2da79fdc611023 -EBUILD imagemagick-7.0.7.14.ebuild 5128 BLAKE2B 984504d2deb835602c1408a8c1e9bbfebc30e075480e33c5f0f49b1547ebc0ad03472e0f1924a0d344963da100450168f3dea5099f5e68931c3b03142e6f4eac SHA512 e5b80bbb489702b684d9142b34f72326fdcb14b4e26d6fb75d0c3b2302c2a983397497d42addc76fbf2a8125d8a79409cc5f1f5324134eef0349dad62f593d4a +EBUILD imagemagick-7.0.7.14.ebuild 5127 BLAKE2B 4a5fb2852fa77134d617bcdd7a5cd727cda908fad0c0b48d4d159bed10551760aa890e2d65ad168be87da5e88d94242398e2e83aadf7f25e6edf19d91ca4e892 SHA512 99b3dcfaf9b7355ef4359bd3f8548b90198628e039eff0342a01c65c4a3064aaaa8b0e95ef475e98a924e50a47f9af5e90ab55115b9419e91d09e1e17da82178 EBUILD imagemagick-7.0.7.6.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 EBUILD imagemagick-7.0.7.8.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.26.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.26.ebuild index 36069f6f824d..8f1a0d693a46 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.9.26.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.9.26.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" RESTRICT="perl? ( userpriv )" diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.14.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.14.ebuild index 4362ee811967..85eb09f65090 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.7.14.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.7.14.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" RESTRICT="perl? ( userpriv )" diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 4d760a93b2c4..5353036d2b28 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,6 +1,4 @@ -AUX krita-3.1.4-qt-5.9.patch 722 BLAKE2B 7ebb7f3e222e2f16842730e481d3e8d1a5759fd7878a7acbccec6edbf151d95c316215df21c72a27771fb72c0e979a4d5316772d2e5959e40b3fb9d9a423a774 SHA512 265b4bdc3b75ac346dac24fad6824dd713f7c40855bb10ab8373b18a55943a67c1b203676689a49d1a34cd682059c70d9371ba463a0e0e16496c67d5b19389c7 AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34 -AUX krita-vc-fix-gcc49-abi.patch 539 BLAKE2B 67925fb6f3b70f6eb6df3e62e2f2da8dda49e6d7e73597d0272df50f909d41b25b2aaa02fdef1ee0d9a2c731c2d4bb0c1a2c04bc930dab98378d49400e464156 SHA512 41e750c336ce2869d5653fd47ce951977af74bd9d8cd0da6fb3d1bcb770759ca531dfe5bcf9f6d1cb4cdb914f7d374b97c9b3a59fa318f121fccf7527654dd2b DIST krita-3.3.2.1.tar.xz 132385220 BLAKE2B c1d6d11435f3b6edf91000bcd395ac982e039b236a311635ada33eabf8afc507661e0930a4a418c808970d07ab12854f7044bb095816954b1c5599123635a471 SHA512 e10a0a0400cd88889fce8b87afa133450401d9b2482d9442fde3b69eb73e5b6ef6f2ca7109599e11aafaf3de2965319b8a6e10c952e039fa23ded31a1346cb6b EBUILD krita-3.3.2.1.ebuild 2553 BLAKE2B 0716dec5a5140e917f63b00bc0ebf9eddaa8aa2be02df27723bf2750f951864e76288867d93a7cc89a34fc1924cdbfedea5b90a5cf77cc4565a414d38eb09572 SHA512 01541dbb987080133677738e003e0e912a89d30f8750ee2268373b7cca4efd432ce3b89a20dddabeedbdd9d4b9d934eb195afa5c03b918006f41f5d26b1fe530 MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27 diff --git a/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch b/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch deleted file mode 100644 index 6bda9ddd2062..000000000000 --- a/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001 -From: Luca Beltrame <lbeltrame@kde.org> -Date: Sat, 6 May 2017 16:00:21 +0200 -Subject: [PATCH] Drop QForeachContainer include and fix Qt 5.9 build - -It's not used anywhere. - -Acked by boud. ---- - libs/ui/KisResourceBundleManifest.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libs/ui/KisResourceBundleManifest.cpp b/libs/ui/KisResourceBundleManifest.cpp -index e4f94ca788..83761657d8 100644 ---- a/libs/ui/KisResourceBundleManifest.cpp -+++ b/libs/ui/KisResourceBundleManifest.cpp -@@ -22,7 +22,6 @@ - #include <QDomElement> - #include <QDomNode> - #include <QDomNodeList> --#include <QForeachContainer> - - #include <KoXmlNS.h> - #include <KoXmlReader.h> diff --git a/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch deleted file mode 100644 index 0f0b9674dd05..000000000000 --- a/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt 2017-02-13 11:12:47.866321035 -0200 -+++ b/CMakeLists.txt 2017-02-13 11:18:55.769657370 -0200 -@@ -533,9 +533,9 @@ - include (VcMacros) - - if(Vc_COMPILER_IS_CLANG) -- set(ADDITIONAL_VC_FLAGS "-Wabi -ffp-contract=fast -fPIC") -+ add_compile_options(-Wabi -ffp-contract=fast -fPIC) - elseif (NOT MSVC) -- set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC") -+ add_compile_options(-Wabi -fabi-version=0 -ffp-contract=fast -fPIC) - endif() - - #Handle Vc master diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest index 7700fbf9809e..dba6a019973e 100644 --- a/media-gfx/meshlab/Manifest +++ b/media-gfx/meshlab/Manifest @@ -12,9 +12,13 @@ AUX 2016.12/0001-use-external-jhead.patch 1405 BLAKE2B 6e0560dc807065bf635612ce8 AUX 2016.12/0001-use-external-lib3ds.patch 1728 BLAKE2B 143e7b64c6a6d859cebab4c4da348b1eaa655d065d42d50edd7e0830f597cefcff004355f81be6b483ee379af6a7c84c26f6d44149e8cfa2192a602c6fbcd7af SHA512 5c5f7c2153912239faf103dd6b54fe0056a1471c825c19ba3a174f336c0c744fa384ae21615e8e38543ef2a85bbfd8e5f9c0e3d5b8c974086ae6ca745b584d98 AUX 2016.12/0001-use-external-muParser.patch 1574 BLAKE2B 0114f8b5f45c93117dda73f16c6f81f6ee21e81fcc995504e772f5ccd1d8ef0659f4e6458921d4b3434b6be6f56636c573921dfa47c302e0989ab6f4fb0465ef SHA512 ecf91a15b4ea3f50ddc927cc259ad57a063e7aab0b034d2228decb797117763fc78760a217321e949e0a783caefed99a2a3a8b4e756e42b0d6941fc04395f292 AUX 2016.12/0001-use-external-openctm.patch 1841 BLAKE2B 8cd4c14c846df052a44d54386948deb161ee8459750e1fe551e79295c56f93eb7d7e678533e0077a071ea4bc95362dec89d02d20c75b943d188ce457b83ca6e9 SHA512 48532da795602ac867bade00e6a649758f7c6d0c26412c8a4486e23239d3d55220ba22ea5b9ca5e11f97ea224626ebb95bbf89cbb707876575a11be891aabcaa +AUX 2016.12/meshlab-2016.12-align1.patch 766 BLAKE2B 4a226e853d8c236ff07d408093bd1e197df202a732e8c6cf429f479c2d9101260d33834e877896ea4570d690fc03c0d60d883b88e9591c9c7781fd0117fc3543 SHA512 4f8684a4fe8fdec286672c330e9c489028518bf121ec561221d3108af44ed4afd3cb3d21113b1b5b110afc127c25d9bc5fb6999be4fd815eddfe3aa406b0f7a7 +AUX 2016.12/meshlab-2016.12-align2.patch 624 BLAKE2B 342231146ef2efc52ae4295d9094e07818d0ce6265a02426d43648d070e0f7b939e4323a820721450ef7c240dc6f0a8459e3608fb74519eeb7e1efea510e2e76 SHA512 cfa90271bd671244ecc4ad92318f2aad31223990843fb3e185e66b51c8b975c5ed3fec73834e379c1498ce35de1a9e217aa28ff2fdea6233abcbdba09896cc19 +AUX 2016.12/meshlab-2016.12-fix-plugins-path.patch 509 BLAKE2B 3a4327b41743704255039f2c06713975c2d842a3af5077385d982107289d33a5a04473f68e21769ca97e45514ca1119244c2b66b5709b99a0b772324e1b0884f SHA512 613b3cec1c50c3d4d6fd3006b80fd4cb3b66a97c1493872d76f95c5ed16ee9c2a9aba5c1a5d021a302114e8e0e172619c4d344306004f109a1f211ee6a14e102 AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9 AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfdef314ac57a144c0a83d59e1d7f2aa5e55c01c41ba671661cdeef249aa09e021085440214910c8153fa6303833c2f SHA512 2ff0391e5c0bd171bb06fc61cbe84112f5e480667f7a7caacbb3b3a0e566c6c2f31f443d8c6026298c3a86bf2979db534989b4eab368baaee67491b95e76723a DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211 +EBUILD meshlab-2016.12-r1.ebuild 3404 BLAKE2B 629d63d555dfe2ecd9e2930b2ed0906470b41214c549876a6986133c9a78930d174b0fbbdbd7554c64a38918468aadea7646296a666e8389dcb063f00d33960a SHA512 b45ec190c310ef42c312dc313ec448121ff3570e6034061854f2e160139ea5d4c205386c3045109be15b6285f35f7c50b877cf39c198f91b6bbf24d7ee849835 EBUILD meshlab-2016.12.ebuild 3340 BLAKE2B 1f2bd515c6058494c9e1da16c3056f60f46f82582a0aea8d02ddc9713b5a7ac1fadb363c593aab0e52eb8a94cf5f874e130726e65a1d8e09ee2ab2817285b02f SHA512 df0abd4786cbe6d54e6de9984940413edff73ba20166a90a14e1fa1d7db82a49fb6bc7486ce25323c89abae06ffe96686f08d7f7ea8823e9d726c1385c50ee7d MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71 diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch new file mode 100644 index 000000000000..cdba89c0ac36 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch @@ -0,0 +1,16 @@ +--- a/meshlabplugins/edit_align/align/AlignGlobal.cpp 2016-12-23 13:24:59.000000000 +0300 ++++ b/meshlabplugins/edit_align/align/AlignGlobal.cpp 2017-11-26 03:05:11.010113483 +0300 +@@ -429,11 +429,11 @@ + + ******************************/ + +-bool AlignGlobal::GlobalAlign(const std::map<int,string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBack* cb ) ++bool AlignGlobal::GlobalAlign(const std::map<int,string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBackPos* cb ) + { + double change; + int step, localmaxiter; +- cb("Global Alignment..."); ++ cb(0,"Global Alignment..."); + LOG(elfp,"----------------\n----------------\nGlobalAlignment (target eps %7.3f)\n",epsilon); + + queue<AlignGlobal::Node *> Q; diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch new file mode 100644 index 000000000000..455eec096c83 --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch @@ -0,0 +1,11 @@ +--- a/meshlabplugins/edit_align/align/AlignGlobal.h 2016-12-23 13:24:59.000000000 +0300 ++++ b/meshlabplugins/edit_align/align/AlignGlobal.h 2017-11-26 03:10:09.210116792 +0300 +@@ -115,7 +115,7 @@ + Node *ChooseDormantWithMostActiveLink (); + void MakeAllDormant(); + void Clear(); +- bool GlobalAlign(const std::map<int,std::string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBack * cb=DummyCallBack ); ++ bool GlobalAlign(const std::map<int,std::string> &Names, const double epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBackPos * cb=DummyCallBackPos ); + + bool CheckGraph(); + diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch new file mode 100644 index 000000000000..d7b17fe904bc --- /dev/null +++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch @@ -0,0 +1,17 @@ +diff --git a/common/pluginmanager.cpp b/common/pluginmanager.cpp +index 5354055..9a523d4 100644 +--- a/common/pluginmanager.cpp ++++ b/common/pluginmanager.cpp +@@ -189,7 +189,11 @@ QString PluginManager::osDependentFileBaseName(const QString &plname) + + QString PluginManager::getBaseDirPath() + { +- QDir baseDir(qApp->applicationDirPath()); ++ #if defined(Q_OS_LINUX) ++ QDir baseDir("/usr/share/meshlab"); ++ #else ++ QDir baseDir(qApp->applicationDirPath()); ++ #endif + + #if defined(Q_OS_WIN) + // Windows: diff --git a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild b/media-gfx/meshlab/meshlab-2016.12-r1.ebuild new file mode 100644 index 000000000000..824261918cdd --- /dev/null +++ b/media-gfx/meshlab/meshlab-2016.12-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit qmake-utils + +DESCRIPTION="the open source system for processing and editing 3D triangular meshes" +HOMEPAGE="http://www.meshlab.net" +VCG_VERSION="1.0.1" +SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="-minimal" +DEPEND="dev-cpp/eigen:3 + dev-cpp/muParser + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtscript:5 + dev-qt/qtxmlpatterns:5 + >=media-gfx/jhead-3.00-r2 + media-libs/glew:0 + media-libs/qhull + =media-libs/lib3ds-1* + media-libs/openctm + sci-libs/levmar + sci-libs/mpir" + +RDEPEND="${DEPEND}" + +S="${WORKDIR}/meshlab-${PV}/src" + +PATCHES=( + "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch" + #remove ot working plugins + "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch" + "${FILESDIR}/${PV}/remove-io_TXT.patch" + #since structure synth doesn't seem to be compiling + "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch" + #this has been fixed in the tree + "${FILESDIR}/${PV}/0001-disable-edit-quality.patch" + #this causes segfaults + "${FILESDIR}/${PV}/0001-disable-filter-layer.patch" + #for when we use minimal + "${FILESDIR}/${PV}/0001-compile-server.patch" + "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch" + "${FILESDIR}/${PV}/0001-use-external-openctm.patch" + "${FILESDIR}/${PV}/0001-use-external-muParser.patch" + "${FILESDIR}/${PV}/0001-use-external-bzip.patch" + "${FILESDIR}/${PV}/0001-use-external-jhead.patch" + "${FILESDIR}/${PV}/0001-use-external-glew.patch" + #cause gnu stack quickstart related qa + "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch" + "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch" + "${FILESDIR}/${PV}/${P}-align1.patch" + "${FILESDIR}/${PV}/${P}-align2.patch" + ) + +src_prepare(){ + mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed" + default + #proof of patchset + #remove libs that are being used from the system + rm -r "external/lib3ds-1.3.0" || die "rm failed" + rm -r "external/OpenCTM-1.0.3" || die "rm failed" + rm -r "external/muparser_v132" || die "rm failed" + rm -r "external/muparser_v225" || die "rm failed" + rm -r "external/bzip2-1.0.5" || die "rm failed" + rm -r "external/jhead-2.95" || die "rm failed" + rm -r "external/glew-1.5.1" || die "rm failed" + rm -r "external/glew-1.7.0" || die "rm failed" + #we still depend on lm.h + #rm -r "external" + rm -r "distrib/plugins/U3D_W32" || die + rm -r "distrib/plugins/U3D_OSX" || die +} + +src_configure() { + use minimal || eqmake5 -r meshlab_full.pro + use minimal && eqmake5 -r meshlab_mini.pro +} + +src_install() { + dobin distrib/{meshlab,meshlabserver} + dolib distrib/libcommon.so.1.0.0 + dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1 + dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so + exeinto /usr/$(get_libdir)/meshlab/plugins + doexe distrib/plugins/*.so + insinto /usr/share/meshlab/shaders + doins -r distrib/shaders/* + insinto /usr/share/meshlab/plugins + doins -r distrib/plugins/* + insinto /usr/share/meshlab/textures + doins -r distrib/textures/* + insinto /usr/share/meshlab/sample + doins -r distrib/sample/* + newicon "${S}"/meshlab/images/eye512.png "${PN}".png + make_desktop_entry meshlab "Meshlab" "${PN}" Graphics +} diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest index 4ebea4539309..a0b7c1eb91e3 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1,7 +1,7 @@ AUX nomacs-3.6.1-batch-resize.patch 757 BLAKE2B 0eba44f34bcde704fcb5ae907ee25fbab3752481409df81d48feb7b923328dd03ceeb0958f5221da493eb9e847f9c8ca7c13a313f532a929e7c6627ddf12f2ff SHA512 781921c31fdd7714e654c7112b4b866c76a2140f5b7e2e9ec2859a06281e01d00912813bae8b6b44b2cc263c27da03ee4610cde692a184125d82747c8c8cf9df DIST nomacs-3.6.1.tar.gz 28604636 BLAKE2B 74045163d5dabf9858de4e11a2300a298c15d691b3991a56dc802e6b16ee484637de05674aa13ba1d31848bce2df4724c3e083c5d35f82dba926b16aeaf81327 SHA512 cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e DIST nomacs-3.8.0.tar.gz 32240476 BLAKE2B b0bf2832cda09c01b98c5ef540a0d3d61046ca652c2c0b8b382ba69b7623327f6bcaf030cce2b87719a4bda1141b2118cb184700bfbff83fc86b496622178a16 SHA512 90ffd1ea7f6d8e2f07b2b093ebc7cfec682f11b874d95e249f3d35a2ceb8b75e7a0c55f19c978231c3c8342abe5cb251359771fd90aa39b50ee0a6d1514e88e1 -EBUILD nomacs-3.6.1-r1.ebuild 1595 BLAKE2B a64210bbce5bbcc99a6828c8c2f3f0c656df8e5cd6ae0cb589e9973b688c1ba309e8f5f977c0fb505a467adb5ee2696ce6c1dd823f8bc04fc38dc43406fa3349 SHA512 af29a193f59c4d70b6ff4721b3fc7143bea2c575dc9029e74db9642a057200a11e3b447945512f1cf5c429cc5137a6d709e40a7b3b36f77db387c3e31e106c94 -EBUILD nomacs-3.6.1.ebuild 1522 BLAKE2B ff44688e4e1e1bf28a889d35125d5c2233e735c32f9df38005781eb2ff9a5d3b41ce2d5d4d9ae41f967aa59300ca470ab8800eb8a6bfcc51d994b7e311bd036e SHA512 96629b2d21f52889069a722d812f09abefa3dbcc2bbaca2d4327c3ceb4c5f5c3ed311b3071b209c9d421059d504fb8888fd62a900d364b5b9e8c2d0cad5ded31 -EBUILD nomacs-3.8.0.ebuild 1658 BLAKE2B af4f894346dfa27e90b52058e419f9853f8e5433031c0a34dfdb48906fcd8ec0c7be36c1667f59cc79ee65d30e8c526056f7ce35046bf28b1dd08ccd73e693a4 SHA512 79b0d1c0194688c97d96d7501bffaef46e2b2769e4262c11d49c72d1d5ce4270d60f1ab92b1321d61e64e1cf0d5e1bcc4ad84f3ed62374d514eb55ad30ce5ac6 +EBUILD nomacs-3.6.1-r1.ebuild 1598 BLAKE2B 95aa8b0faf792aa1a6fdd92f1b3ef1f3ab740eb3900e454f2ba45a7f4700b0ddd20ecf9f40cbe086932058b2a9a670d71c3c11c0b7f7e57d1efc57b1abd1cdfa SHA512 57fce8366da69eff7739e5cd05c461ab1a577e59caf194d2b472ab1db83c29ad2ed12da6372d651d15339ae0307d58e260686e78f67ede84fcfd71f86b6054a8 +EBUILD nomacs-3.6.1.ebuild 1525 BLAKE2B 83b19ed4151eae94e9790808785f5df97612fb73c382bc37ee8f5b7bac4500a44ed84a9d98bce0ed066c8751042025503be9a0a8b8b652f7503713654c22a085 SHA512 6d70ba584e61c30d9cb5d3f3c6d5aa716d6ca02549f7079236e1bdfede378eee9699817971793fff1eacd802af0049c0c6feb4bf3b2f14e782a031a79e299bdf +EBUILD nomacs-3.8.0.ebuild 1661 BLAKE2B 286200d262f759b648747fb014ca76c24718153b9cbca0630b645637976a1b8871126809ab47971a1b03ac010ee3b3b163936c31d6a35e736c4eeead0dd8d528 SHA512 1edc2400b6f53cfbcc900cb8e3c94d82b3a1a4fc216383de413a73b9c76eada1bf5a8ffbb03a3aa35ccdd229171451352a334e34f1b90906bfc5c038c4f1fd31 MISC metadata.xml 588 BLAKE2B 544009f8f7b184b666e5b7bbb88ce395028032bd060a7abe16f2ed096accb11b0819c19b3898ca1fc96c61aacc9cf0bb5960716f711ba77c5f545f040dd31567 SHA512 f681a8f2f1ec2c2902d34829245790edd014eca1829479f2a47b9179f370d3c3d3c562c32dae1918a7616c8f75c7d94b525beec410ad39704b25fd502cefb5fb diff --git a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild index 6ae732365e60..4f755d2ab8f7 100644 --- a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild +++ b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild @@ -34,7 +34,7 @@ RDEPEND=" dev-qt/qtimageformats:5 media-libs/tiff:0 ) - zip? ( >=dev-libs/quazip-0.7.2[qt5] ) + zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] ) " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 diff --git a/media-gfx/nomacs/nomacs-3.6.1.ebuild b/media-gfx/nomacs/nomacs-3.6.1.ebuild index d110997b2f37..c88239195c8f 100644 --- a/media-gfx/nomacs/nomacs-3.6.1.ebuild +++ b/media-gfx/nomacs/nomacs-3.6.1.ebuild @@ -31,7 +31,7 @@ RDEPEND=" opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) - zip? ( >=dev-libs/quazip-0.7.2[qt5] ) + zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] ) " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 diff --git a/media-gfx/nomacs/nomacs-3.8.0.ebuild b/media-gfx/nomacs/nomacs-3.8.0.ebuild index bf86f10b9e3b..91389e8030f2 100644 --- a/media-gfx/nomacs/nomacs-3.8.0.ebuild +++ b/media-gfx/nomacs/nomacs-3.8.0.ebuild @@ -34,7 +34,7 @@ RDEPEND=" dev-qt/qtimageformats:5 media-libs/tiff:0 ) - zip? ( >=dev-libs/quazip-0.7.2[qt5] ) + zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] ) " DEPEND="${RDEPEND} dev-qt/linguist-tools:5 diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest index a2dfcee84f89..2c831a10efdd 100644 --- a/media-gfx/pqiv/Manifest +++ b/media-gfx/pqiv/Manifest @@ -1,6 +1,8 @@ DIST pqiv-2.10.1.tar.gz 138129 BLAKE2B 46503e6012854562d1ff1bbf43d218dbdc6f9e7000c8625de73a708061a6c1678622b48270c73b3a16fff2fdac60bf5097376dfd0a6f5c7c2e36611aed8bd3cc SHA512 9850f6693e7fd2942d105736a7d6a274388875770e194ac6bd8a5a8291db8fec1ee3a0262f911f2b8e5d115aa11d520c44d80cc8218e2c87d6935dea4dfcb97e +DIST pqiv-2.10.2.tar.gz 138506 BLAKE2B 255104acec9d42eac52d8aaf05207fc8071ecbef14a04c5952e70347d0cd83b54b00725b9bb949184bcd9437982701814b6a09c4c2397336f26ce9f50896d2e6 SHA512 99cb3a187fa2cc0df7b7f768b2f801fbec78aa8d76aacd12085f3b8ccbfaf931a2379e7b05a92f83dacf511489518a75f9e5bf528e4152158d8bb75cffb0d6f7 DIST pqiv-2.9.tar.gz 133823 BLAKE2B a43c5323c47c10a94f83e8ed065e26212bf023f483cbc0e2160fe7789a55a043bb5912ed62306a15193edeb7ffca0450619799843101c41246ce867da3ffe6e3 SHA512 0a509d5d4b41682f86f4b813d63f3f7f8f3977ede0b8b1649a2adc188ed83923147b8bb741ba7f85b4c1dd7a9612fca3fec44169364042be4db44ef53d813ab7 EBUILD pqiv-2.10.1.ebuild 1801 BLAKE2B 7e8f0f56ed1f6072aa6ba355091625db07bd0c0d78dcd7b79c0df75f8e5f51884f8dfe7d870ce3ee2c8cd843230f6ff2d945fec0018845ba427d73e709183cfd SHA512 626d80674d7314ca9fdd8ff9e2da9e4282ccfc7d82c7686618bb2342035072106e4e8102dd12d82802eb46ab5af97595d39131f8c4c0471c69ae8f01c5b13b9a +EBUILD pqiv-2.10.2.ebuild 1801 BLAKE2B 7e8f0f56ed1f6072aa6ba355091625db07bd0c0d78dcd7b79c0df75f8e5f51884f8dfe7d870ce3ee2c8cd843230f6ff2d945fec0018845ba427d73e709183cfd SHA512 626d80674d7314ca9fdd8ff9e2da9e4282ccfc7d82c7686618bb2342035072106e4e8102dd12d82802eb46ab5af97595d39131f8c4c0471c69ae8f01c5b13b9a EBUILD pqiv-2.9.ebuild 1798 BLAKE2B 32382a6be43d17d8fa792e6db80df069a0277e06bbed0dc9d6127c5a04717855db8fe584fd4434d30a1d83b833ab74fdb70ff95d7ff4e746e92fecf40de4b634 SHA512 1285d38a37bce7f5670f7e39136a834b60af8c71db12bf84a962636ca9da5c27e162fe71e243f9c30689f2f2eba5277c121305d8e4f11f50fddcf635a60dfae9 EBUILD pqiv-9999.ebuild 1800 BLAKE2B c094f1ddfd450720f7541984223be19392830dfafd5d648aa9ad7d31f5ead69f40f37abc30db7fba2de8e1baeb129dee9bc620b55d97ea5ced0fee0345148559 SHA512 33ddac017e8c65c6df0b91ee20483a8bb486031c306e992593fb72f60740f8ad832eb8b8200aa52f89d9467dedf652bcebfdec5cd70a6063a25f5962c468288a MISC metadata.xml 584 BLAKE2B 5d617c553a0f5f4be6268f17dae36d3bb52e984c4c7c89df44b40e1bde1cff3e5619210548b93bf6ffc2e0ea32839d6b4fd39714b237aea23f1cad966c92b3ec SHA512 0d589cf085f6e6335aae5f6e32ccd153ddae1f0fa926fd3a135eabcdc20d5c560e2694216ba93b6d8c6c16bd8541f9d7aaa496e7ee4bc82fea90228a28320fbd diff --git a/media-gfx/pqiv/pqiv-2.10.2.ebuild b/media-gfx/pqiv/pqiv-2.10.2.ebuild new file mode 100644 index 000000000000..68f387141219 --- /dev/null +++ b/media-gfx/pqiv/pqiv-2.10.2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit linux-info toolchain-funcs xdg-utils + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/phillipberndt/pqiv.git" + inherit git-r3 +else + SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI" +HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="archive ffmpeg imagemagick kernel_linux libav pdf postscript webp" + +RDEPEND=" + >=dev-libs/glib-2.32:2 + >=x11-libs/cairo-1.6 + x11-libs/gtk+:3 + archive? ( app-arch/libarchive:0= ) + ffmpeg? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav:0= ) + ) + imagemagick? ( media-gfx/imagemagick:0= ) + pdf? ( app-text/poppler:0= ) + postscript? ( app-text/libspectre:0= ) + webp? ( media-libs/libwebp:0= ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +doecho() { + echo "$@" + "$@" || die +} + +pkg_setup() { + if use kernel_linux; then + CONFIG_CHECK="~INOTIFY_USER" + linux-info_pkg_setup + fi +} + +src_configure() { + local backends="gdkpixbuf" + use archive && backends+=",archive,archive_cbx" + use ffmpeg || use libav && backends+=",libav" + use imagemagick && backends+=",wand" + use pdf && backends+=",poppler" + use postscript && backends+=",spectre" + use webp && backends+=",webp" + + doecho ./configure \ + --backends-build=shared \ + --backends=${backends} \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --destdir="${ED}" +} + +src_compile() { + tc-export CC + emake VERBOSE=1 CFLAGS="${CFLAGS}" +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest index d9010508edcc..25c5330ea670 100644 --- a/media-gfx/uniconvertor/Manifest +++ b/media-gfx/uniconvertor/Manifest @@ -5,5 +5,5 @@ AUX uniconvertor-2.0_pre379-libimg.patch 1201 BLAKE2B d25aa6bb28c6328ade007da102 AUX uniconvertor-2.0_pre379-test.patch 1544 BLAKE2B 16e8b1ddd6d0ca064a2f1be12ac97bf75dccd3d73fffb252253154779d0175ac292a08f4bb38deeb815a5e6cf624a9ff80654627e46d02655c315fd7b2a640ce SHA512 760ea5ced19040d0d29230f9d6fdafafd7f6fcdd727e18261730b7696d0e9a85037cdceab8e20f202a79bd7b8c84edfa7f21619bfde1320bbdc1e1d0c6d298db DIST uniconvertor-2.0_pre379.tar.xz 1844780 BLAKE2B 51698d88941be700dd31e5527a8ffc8b2548d9f1323242e8f31a3ad00f2e4a2c5617be87443b130d664aeceea8b96ff17b72dfe32964854cc8f121351a918ec3 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea EBUILD uniconvertor-2.0_pre379-r1.ebuild 1355 BLAKE2B 4cbebdbb4fabdd2fa45f00e66799e1bc8808c15851907850b515cab530e73821ad2bde90407aebc83b8fd21c1874d4df2ad6b82028b8c4b95d64a20c06f38317 SHA512 c990abe8e8a93c23617e3317a91b935b4f59259fc85e1907ff63da3e8f230c055246ad6f3b1aa421d1e6a5caafc938a589e117a2fea0fcc0e9c9203429b5b4a9 -EBUILD uniconvertor-2.0_pre379-r2.ebuild 1688 BLAKE2B e8121bfd5e8c576b779b2aead535188b16273f5b39763b4931682e6d32af7452e49d5d695912c25c514ee1fb04d006f9ba0ecdf616275abbb9399400747065bc SHA512 67cb5ff92ab16e238ebbe178ae6df11502dec40cf995a3d21fad4b7309d2038c47cd58fe32dbacb8eb4824b56cd50c4cda749c75124a9d6d2e71318ff8ab9fb3 +EBUILD uniconvertor-2.0_pre379-r2.ebuild 1686 BLAKE2B 6152a4bd1dc4516623b20ff0341c9a962fcf665010bfd7b886229dbccfa2c530ddee30402bdc0e1802e9b1012406d9eb90dfc37569eca44f7c904b13fb77336f SHA512 20d48bb35710fcff6aaf6ec1d1685397157482d510edc3756707872d56ed46c6a24e9915fa75d1f86654020945ebe96d6b6825c305ee38bfe8b7bf10ba8e9178 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild index 1f6be392d21a..22552436a69b 100644 --- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild +++ b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Convert vector graphic file formats like .cdr, .svg, wmf and more." HOMEPAGE="https://sk1project.net/modules.php?name=Products&product=uniconvertor" SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" SLOT="0" LICENSE="GPL-2 LGPL-2" IUSE="" |