diff --git a/kde/applications/okular/hidpi.patch b/kde/applications/okular/hidpi.patch deleted file mode 100644 index d6250aed..00000000 --- a/kde/applications/okular/hidpi.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/shell/main.cpp b/shell/main.cpp -index 3c4bb47231b3928565a796c292e1a48ca7c2f6cc..ea0d3bcec3f73826950a8141a708ce9e3ff51d60 100644 ---- a/shell/main.cpp -+++ b/shell/main.cpp -@@ -31,7 +31,12 @@ - - int main(int argc, char** argv) - { -- QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -+ /** -+ * enable high dpi support -+ */ -+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); -+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); -+ - #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QCoreApplication::setAttribute(Qt::AA_CompressTabletEvents); - #endif -@@ -86,7 +91,7 @@ int main(int argc, char** argv) - break; - } - } -- -+ - return app.exec(); - } - diff --git a/kde/applications/okular/okular.py b/kde/applications/okular/okular.py index 16a94d2c..aced428e 100644 --- a/kde/applications/okular/okular.py +++ b/kde/applications/okular/okular.py @@ -1,71 +1,70 @@ import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() self.description = "KDE document viewer" self.displayName = "Okular" - self.patchToApply["19.08.1"] = [ - ("hidpi.patch", 1), + self.patchToApply["19.08.2"] = [ ("breeze.patch", 1), ] def setDependencies(self): self.buildDependencies["libs/chm"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["qt-libs/poppler"] = None self.runtimeDependencies["libs/tiff"] = None self.runtimeDependencies["libs/djvu"] = None self.runtimeDependencies["libs/zlib"] = None self.runtimeDependencies["libs/freetype"] = None self.runtimeDependencies["libs/ebook-tools"] = None self.buildDependencies["libs/libspectre"] = None self.runtimeDependencies["libs/ghostscript"] = None self.runtimeDependencies["kde/applications/libkexiv2"] = None self.runtimeDependencies["kde/kdegraphics/kdegraphics-mobipocket"] = None self.runtimeDependencies["kde/frameworks/tier1/karchive"] = None self.runtimeDependencies["kde/frameworks/tier3/kbookmarks"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier3/kconfigwidgets"] = None self.runtimeDependencies["kde/frameworks/tier1/kcoreaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/kdbusaddons"] = None self.runtimeDependencies["kde/frameworks/tier3/kactivities"] = None self.runtimeDependencies["kde/frameworks/tier3/kjs"] = None self.runtimeDependencies["kde/frameworks/tier3/kio"] = None self.runtimeDependencies["kde/frameworks/tier3/kparts"] = None self.runtimeDependencies["kde/frameworks/tier1/threadweaver"] = None self.runtimeDependencies["kde/frameworks/tier3/kwallet"] = None self.runtimeDependencies["kde/frameworks/tier3/khtml"] = None # try to use Breeze style as Windows style has severe issues for e.g. scaling self.runtimeDependencies["kde/plasma/breeze"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) def createPackage(self): self.blacklist_file.append(os.path.join(self.packageDir(), "blacklist.txt")) self.defines["executable"] = r"bin\okular.exe" self.defines["mimetypes"] = ["application/pdf"] self.defines["file_types"] = [".pdf", ".mobi", ".epub", ".tiff"] # okular icons self.defines["icon"] = os.path.join(self.packageDir(), "okular.ico") self.defines["icon_png"] = os.path.join(self.packageDir(), ".assets", "150-apps-okular.png") self.defines["icon_png_44"] = os.path.join(self.packageDir(), ".assets", "44-apps-okular.png") # this requires an 310x150 variant in addition! #self.defines["icon_png_310x310"] = os.path.join(self.packageDir(), ".assets", "310-apps-okular.png") self.ignoredPackages.append("binary/mysql") self.ignoredPackages.append("dev-utils/sed") self.ignoredPackages.append("kde/frameworks/kdesignerplugin") self.ignoredPackages.append("kde/frameworks/kemoticons") return TypePackager.createPackage(self)