From f45955e60d4da9b7f4a1088c98042f9c06669039 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Dec 2017 09:09:16 +0000 Subject: gentoo resync : 10.12.2017 --- app-text/djview/Manifest | 22 ++++--- app-text/djview/djview-4.10.3.ebuild | 4 +- app-text/djview/djview-4.10.5.ebuild | 4 +- app-text/djview/djview-4.10.6-r1.ebuild | 85 +++++++++++++++++++++++++ app-text/djview/djview-4.10.6.ebuild | 2 +- app-text/djview/djview-4.10.ebuild | 4 +- app-text/djview/djview-4.9.ebuild | 2 +- app-text/djview/files/djview-4.10.6-hidpi.patch | 68 ++++++++++++++++++++ 8 files changed, 173 insertions(+), 18 deletions(-) create mode 100644 app-text/djview/djview-4.10.6-r1.ebuild create mode 100644 app-text/djview/files/djview-4.10.6-hidpi.patch (limited to 'app-text/djview') diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest index b653c78e46b1..377290317d1f 100644 --- a/app-text/djview/Manifest +++ b/app-text/djview/Manifest @@ -1,11 +1,13 @@ -DIST djview-4.10.3.tar.gz 1119618 SHA256 50b80ecddc5aec03c49882c91b3af2f42abfe8454d5ddc01fb313e3481e6ab25 SHA512 6e3da481cec699558cbdca17b19b971d693341e6f5ffc07010f8ba717c6434e6d96969bfc322e4edcaaa5fd364e583c7c0908c814725caad4dcc3dad968a74c5 WHIRLPOOL 54ce8245b13c189a58e3f8171cecd3c1c48e8e56bdae3103b19186627fb002521e3fa25c1e81a49149d8b331fd9636af4badbb0be389d56022cab87ff8f2e60d -DIST djview-4.10.5.tar.gz 1111729 SHA256 a0b302807106053d1983659ebb0139c7b1c393b3e6407f1f47990d7e3c5d7b3d SHA512 d7fa4e643e006cb1d71fe6d808fd1b200b965928bf2cdd872c9c1c1833bed71ac3c70a2967a06f31bbd83f347cb5e330f4869e42e7d9c6cd13a0db54e4354614 WHIRLPOOL 319329ac099504a3443638c91a3d078e72d231fd56504198e88017d101f8e492250d9a9205ab0eabf04af59cde2f1bad1a4056f5c8d2a99de4f916b46eda6e0e -DIST djview-4.10.6.tar.gz 1113072 SHA256 8446f3cd692238421a342f12baa365528445637bffb96899f319fe762fda7c21 SHA512 c06b9c4c7addd9dededdc9d441094bca685c4d23744e3d1208eab33d9d341a85f120176bf9f1b879ac6620f591eefe05ac774870b1ba3215c43baf1eaf9d14f8 WHIRLPOOL c5596ea985cc9c7d6516ea851acdfb908617277a1c5b4425253bad0b907b7c50b22d23e07bcd60da188e324289217f0fbddcf0c38fa42ac367060692a259976b -DIST djview-4.10.tar.gz 1077198 SHA256 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f SHA512 b3755992df2000f088a93c0d77d4a2ea62f6495f67106142d4787b94d248c54561068a40700c18325c0977a057b26948762a7b71c392b0ccef455776dcb0aad0 WHIRLPOOL 179d850a994521c02a7c64e17aa8d5c618011e8a765023325bc86e19f8b7797ac1f70962b1ccb9438b3a853463c797698a29d09f937317fa0ab0ac65b5016f29 -DIST djview-4.9.tar.gz 930676 SHA256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 WHIRLPOOL b522f9ba7283430fa7134f172b6a358c95da03e10fcf1e5f55bdd5c9be1f2929c07682e48e3a90695c838dfd2ffb875794c95e70d4096dd9595da402f76523fd -EBUILD djview-4.10.3.ebuild 1977 BLAKE2B c8b701604d32cef042adb9c4cd12ff60f7b5b0cde1084984cbb36a8ce76572df1d0b5ff286166016f6b42a398b7b4b2ff5261320c1ebbc93296b56470e37d651 SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 -EBUILD djview-4.10.5.ebuild 1977 BLAKE2B c8b701604d32cef042adb9c4cd12ff60f7b5b0cde1084984cbb36a8ce76572df1d0b5ff286166016f6b42a398b7b4b2ff5261320c1ebbc93296b56470e37d651 SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 -EBUILD djview-4.10.6.ebuild 1974 BLAKE2B c79ef9ea75611041256153d85484ac48a4cf31166b7ff052da1fea7ebbb49c380db597914c97164204848ffa4b6f647f53dead363bc67cbddd224d3ef824365c SHA512 f9e63674541a39acc816f4f9e7223e7dc8a42193946f127ea8554ac7177c2cad9e773619351d40eb2d4260af04ae5760ed2228c10f3f6f92775914d3ce88d32d -EBUILD djview-4.10.ebuild 2027 BLAKE2B ca271d0bea9b072e044e37555c0621474115416ae0242933b442c8e4d318627ae338c83ef68903bb6f1ca62bba2ae29e5e6a33de5359baae500d6b112d196509 SHA512 3ceea3d4e3e82acf37d6612391b9f9d38d324a3e2a2ba8f8c6e667cbe5bf43cbf40c4fc5f2c055de82f521dbe8d76e448169d531e815d061ed5f38928d93cae5 -EBUILD djview-4.9.ebuild 1946 BLAKE2B fb46a53d90cd4313c90acef2ec11350a7ef296154e9d0b37740c210f1495bf6588256cf7e7654b67dfcd4a92cd13cbe76f56838af2418107d780e6a2a748d8c3 SHA512 d9c66756fdd98c2ae8323a1c23f5f171b205e8c6dae4c6de256c15fee6bb3c870edec36b4278a8e524fff7e7984cc657d97c4e54aee890e9bac9295af674ff36 +AUX djview-4.10.6-hidpi.patch 2313 BLAKE2B 4d3356baa36cf830a8e01314f6fbf081c0b8fe8b6a43b2e14e4966fab2d07932088c66e1f68802282537d490503586a528c2a4b86eea26615fc8eefbf6b7d058 SHA512 922b0c321edaeed3a76ee206fa4353366e3d744dd30612d034070c251ecfca6bc18a2ddaf110cfbc811ea47426f2d9e370d5a58cce41b396b793ba27223bb881 +DIST djview-4.10.3.tar.gz 1119618 BLAKE2B 31cd334c18ce9b891fe34945715317de6b093cfa7e0cad6e32c47bc533c78f8a44856c763475782c926932566d8604d3e93bcb4705c8586d966f140c040f69d4 SHA512 6e3da481cec699558cbdca17b19b971d693341e6f5ffc07010f8ba717c6434e6d96969bfc322e4edcaaa5fd364e583c7c0908c814725caad4dcc3dad968a74c5 +DIST djview-4.10.5.tar.gz 1111729 BLAKE2B 6e6607dcfd3b20c5a514ad851d404c616f2be58c4813d4ba5ae91cdb7b808a77284419a4080063a36371085aa72c0bfa5dd804e269f5e08a75991ae3ef3da3b0 SHA512 d7fa4e643e006cb1d71fe6d808fd1b200b965928bf2cdd872c9c1c1833bed71ac3c70a2967a06f31bbd83f347cb5e330f4869e42e7d9c6cd13a0db54e4354614 +DIST djview-4.10.6.tar.gz 1113072 BLAKE2B db965ad7dc3b8191855e9c5f23af3cd963901ca649a937e6f85bad8f9f924e0636b30a9a5350c114dcfecea570f013ba395508eb6cf1d45afda674892bcd196e SHA512 c06b9c4c7addd9dededdc9d441094bca685c4d23744e3d1208eab33d9d341a85f120176bf9f1b879ac6620f591eefe05ac774870b1ba3215c43baf1eaf9d14f8 +DIST djview-4.10.tar.gz 1077198 BLAKE2B 57c9d3a8bab485929880e11aad5602a3d415fe2690abc0759b0ac4b553e8c3e8624a505cee291150df7842f02f9f1a15848daaaa843e0ed9543a42400336bd05 SHA512 b3755992df2000f088a93c0d77d4a2ea62f6495f67106142d4787b94d248c54561068a40700c18325c0977a057b26948762a7b71c392b0ccef455776dcb0aad0 +DIST djview-4.9.tar.gz 930676 BLAKE2B 384cf46d4258bb6b5fcf8e4c0b64787bdf7edd281fafdd170e6a1fe1208ea3fc207c39938e5ebd525c8857e59f0090de0d2916d2bfe9fb86f85a7bac1f081918 SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 +EBUILD djview-4.10.3.ebuild 1976 BLAKE2B 240fe2a3524c4a4e9d3446155df69cdf86f85ba39e7fcd047b66958179c5e5b804f91feedf880bc1ec8fc2601e0bc72c4dc93e70c1f4fc364f54bd186f33d4ec SHA512 008cb8e128ad02b85ab1c5bcc8e16eb5cb07f6bd7a932bbcd049ef641e77a94d3c62acb967f07c7959037ec68b317f9b67292c38ad61037f8de790ecfdf06c12 +EBUILD djview-4.10.5.ebuild 1976 BLAKE2B 240fe2a3524c4a4e9d3446155df69cdf86f85ba39e7fcd047b66958179c5e5b804f91feedf880bc1ec8fc2601e0bc72c4dc93e70c1f4fc364f54bd186f33d4ec SHA512 008cb8e128ad02b85ab1c5bcc8e16eb5cb07f6bd7a932bbcd049ef641e77a94d3c62acb967f07c7959037ec68b317f9b67292c38ad61037f8de790ecfdf06c12 +EBUILD djview-4.10.6-r1.ebuild 2034 BLAKE2B 57fcd0e83d380eeb73f49c33448a656e55b09d680daa76c1d74784cec6a8193fbdefa5101bff2a651d2cb4b0e2fdd227694b23e0f6e033647ddf0c75564b2b81 SHA512 7ed4c8953b1326face2088ee6e8140b8cf73a13a163e16cdad1b5062459e57039410341512b272e9ce0c80955a6141f127b9d4a9791ee86e62e457e4d4c430e7 +EBUILD djview-4.10.6.ebuild 1973 BLAKE2B 2adc6d1f7a476489fe782173a6dffd29ff6614153b435372a5ba7601236c08cee5b4599883f79fc26070c8c09e42dd5629b2385df2ebeadcc3a00842cc7bbc44 SHA512 386c0912d43e380daf2b2f6d99347e04f74538f5d287e85d13b324d3b63387e4d63f651f4f51886de20622bf70889f8f0879b7193641d4704dffec81beee500f +EBUILD djview-4.10.ebuild 2026 BLAKE2B 6de40b276a954aec044457292b6495de4f3737b955e65dad75b990b73edc4267ed0f296f51bafb734bec01aa88aee6ef27408ee12d359e67611901dc818acb2a SHA512 cc75b12554250cd19fd62d0f0e55222ffadd4734047920385f0848b13b8657f5d19ef78bfb9482438133bb9fdd57c9a58541cf24df2bf4ce67a03f9bfaaeae14 +EBUILD djview-4.9.ebuild 1945 BLAKE2B f566da0cdc06eb299452a5640a4b6c2d1a12fc4cd3eb4f3697724a219b6eaaadbd908d9d461ed6b91f92c29b2bcad6af459d299849415588b3d9a04ffca08fd6 SHA512 08264dcd607a17f4fc79994a0ac144edc94c325768e16530d185026ba459cb976ce43fe9d36728cabfade3b75b0d4c71847e0a8464f8e9cd7d121fd095e5c04e MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4 diff --git a/app-text/djview/djview-4.10.3.ebuild b/app-text/djview/djview-4.10.3.ebuild index 21dc4b949344..18ba0f5fac98 100644 --- a/app-text/djview/djview-4.10.3.ebuild +++ b/app-text/djview/djview-4.10.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins -DESCRIPTION="Portable DjVu viewer using Qt4" +DESCRIPTION="Portable DjVu viewer using Qt" HOMEPAGE="http://djvu.sourceforge.net/djview4.html" SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz" diff --git a/app-text/djview/djview-4.10.5.ebuild b/app-text/djview/djview-4.10.5.ebuild index 21dc4b949344..18ba0f5fac98 100644 --- a/app-text/djview/djview-4.10.5.ebuild +++ b/app-text/djview/djview-4.10.5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins -DESCRIPTION="Portable DjVu viewer using Qt4" +DESCRIPTION="Portable DjVu viewer using Qt" HOMEPAGE="http://djvu.sourceforge.net/djview4.html" SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz" diff --git a/app-text/djview/djview-4.10.6-r1.ebuild b/app-text/djview/djview-4.10.6-r1.ebuild new file mode 100644 index 000000000000..21340c900687 --- /dev/null +++ b/app-text/djview/djview-4.10.6-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools gnome2-utils flag-o-matic nsplugins qmake-utils toolchain-funcs versionator xdg-utils + +DESCRIPTION="Portable DjVu viewer using Qt" +HOMEPAGE="http://djvu.sourceforge.net/djview4.html" +SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="debug nsplugin" + +RDEPEND=" + >=app-text/djvu-3.5.22-r1 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.67 + virtual/pkgconfig + nsplugin? ( dev-libs/glib:2 )" + +DOCS=( README NEWS ) + +PATCHES=( "${FILESDIR}/${P}-hidpi.patch" ) + +src_prepare() { + default + + # Force XEmbed instead of Xt-based mainloop (disable Xt autodep) + sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die + sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688 + rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4} + AT_M4DIR="config" eautoreconf +} + +src_configure() { + # See config/acinclude.m4 + use debug || append-cppflags "-DNDEBUG" + + QTDIR=$(qt5_get_libdir)/qt5 \ + econf \ + --with-x \ + --disable-desktopfiles \ + $(use_enable nsplugin nsdejavu) +} + +src_compile() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" +} + +src_install() { + emake DESTDIR="${D}" \ + plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \ + install + + einstalldocs + + cd desktopfiles + insinto /usr/share/icons/hicolor/32x32/apps + newins prebuilt-hi32-djview4.png djvulibre-djview4.png + insinto /usr/share/icons/hicolor/64x64/apps + newins prebuilt-hi64-djview4.png djvulibre-djview4.png + insinto /usr/share/icons/hicolor/scalable/apps + newins djview.svg djvulibre-djview4.svg + sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop + domenu djvulibre-djview4.desktop +} + +pkg_postinst() { + xdg_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_icon_cache_update +} diff --git a/app-text/djview/djview-4.10.6.ebuild b/app-text/djview/djview-4.10.6.ebuild index 46134eee485f..1673340f0b0d 100644 --- a/app-text/djview/djview-4.10.6.ebuild +++ b/app-text/djview/djview-4.10.6.ebuild @@ -5,7 +5,7 @@ EAPI=4 inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins -DESCRIPTION="Portable DjVu viewer using Qt4" +DESCRIPTION="Portable DjVu viewer using Qt" HOMEPAGE="http://djvu.sourceforge.net/djview4.html" SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz" diff --git a/app-text/djview/djview-4.10.ebuild b/app-text/djview/djview-4.10.ebuild index bc6ab11b3c1e..685793424f79 100644 --- a/app-text/djview/djview-4.10.ebuild +++ b/app-text/djview/djview-4.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -7,7 +7,7 @@ inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs MY_P=${PN}-$(replace_version_separator 2 '-') -DESCRIPTION="Portable DjVu viewer using Qt4" +DESCRIPTION="Portable DjVu viewer using Qt" HOMEPAGE="http://djvu.sourceforge.net/djview4.html" SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz" diff --git a/app-text/djview/djview-4.9.ebuild b/app-text/djview/djview-4.9.ebuild index 6967929f902a..ba3ac87ae10d 100644 --- a/app-text/djview/djview-4.9.ebuild +++ b/app-text/djview/djview-4.9.ebuild @@ -7,7 +7,7 @@ inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs MY_P=${PN}-$(replace_version_separator 2 '-') -DESCRIPTION="Portable DjVu viewer using Qt4" +DESCRIPTION="Portable DjVu viewer using Qt" HOMEPAGE="http://djvu.sourceforge.net/djview4.html" SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz" diff --git a/app-text/djview/files/djview-4.10.6-hidpi.patch b/app-text/djview/files/djview-4.10.6-hidpi.patch new file mode 100644 index 000000000000..1063b4c5b827 --- /dev/null +++ b/app-text/djview/files/djview-4.10.6-hidpi.patch @@ -0,0 +1,68 @@ +commit 090398d4181797d2284be16026f8e0573fd0579b +Author: Leon Bottou +Date: Wed Mar 2 20:52:03 2016 -0500 + + High dpi support for page thumbnails + +diff --git a/src/djview.cpp b/src/djview.cpp +index 2571c49..df14110 100644 +--- a/src/djview.cpp ++++ b/src/djview.cpp +@@ -137,7 +137,12 @@ QDjViewApplication::QDjViewApplication(int &argc, char **argv) + extern void qt_mac_set_native_menubar(bool); + qt_mac_set_native_menubar(false); + #endif +- ++ ++ // Enable highdpi pixmaps ++#if QT_VERSION >= 0x50200 ++ setAttribute(Qt::AA_UseHighDpiPixmaps, true); ++#endif ++ + // Wire session management signals + connect(this, SIGNAL(saveStateRequest(QSessionManager&)), + this, SLOT(saveSessionState(QSessionManager&)) ); +diff --git a/src/qdjviewsidebar.cpp b/src/qdjviewsidebar.cpp +index 38edf45..34e8c3c 100644 +--- a/src/qdjviewsidebar.cpp ++++ b/src/qdjviewsidebar.cpp +@@ -603,9 +603,14 @@ QDjViewThumbnails::Model::makeIcon(int pageno) const + if (doc) + { + // render thumbnail +- int w = size; +- int h = size; +- QImage img(size, size, QImage::Format_RGB32); ++#if QT_VERSION >= 0x50200 ++ int dpr = djview->devicePixelRatio(); ++#else ++ int dpr = 1; ++#endif ++ int w = size * dpr; ++ int h = size * dpr; ++ QImage img(size*dpr, size*dpr, QImage::Format_RGB32); + int status = ddjvu_thumbnail_status(*doc, pageno, 0); + if (status == DDJVU_JOB_NOTSTARTED) + { +@@ -614,9 +619,9 @@ QDjViewThumbnails::Model::makeIcon(int pageno) const + else if (ddjvu_thumbnail_render(*doc, pageno, &w, &h, format, + img.bytesPerLine(), (char*)img.bits() )) + { +- QPixmap pixmap(size,size); ++ QPixmap pixmap(size*dpr,size*dpr); + pixmap.fill(); +- QPoint dst((size-w)/2, (size-h)/2); ++ QPoint dst((size*dpr-w)/2, (size*dpr-h)/2); + QRect src(0,0,w,h); + QPainter painter; + painter.begin(&pixmap); +@@ -625,6 +630,9 @@ QDjViewThumbnails::Model::makeIcon(int pageno) const + painter.setPen(Qt::darkGray); + painter.drawRect(dst.x(), dst.y(), w-1, h-1); + painter.end(); ++#if QT_VERSION >= 0x50200 ++ pixmap.setDevicePixelRatio(dpr); ++#endif + return QIcon(pixmap); + } + } -- cgit v1.2.3