From 25378a6aa0b8601044175b4648bb3db83971659b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 18 Feb 2017 13:01:32 -0600 Subject: Remove kde4.qtcurve - Not useful without the KDE 4 desktop --- pkgs/misc/themes/qtcurve/default.nix | 43 ---------------------- .../qtcurve/qtcurve-1.8.18-install-paths.patch | 24 ------------ .../qtcurve/qtcurve-1.8.18-toolbar-alpha.patch | 34 ----------------- 3 files changed, 101 deletions(-) delete mode 100644 pkgs/misc/themes/qtcurve/default.nix delete mode 100644 pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch delete mode 100644 pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch (limited to 'pkgs/misc/themes') diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix deleted file mode 100644 index cc11aab81cd8..000000000000 --- a/pkgs/misc/themes/qtcurve/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, gtk2, kde_workspace, kdelibs # Toolkit dependencies -, libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies -}: - -stdenv.mkDerivation { - name = "qtcurve-1.8.18"; - src = fetchurl { - url = "https://github.com/QtCurve/qtcurve/archive/1.8.18.tar.gz"; - sha256 = "19kk11hgi6md1cl0hr0pklcczbl66jczahlkf5fr8j59ljgpr6c5"; - }; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - buildInputs = [ - gtk2 - kde_workspace - kdelibs - libpthreadstubs - libXdmcp - libxcb - pkgconfig - xorg.libxshmfence - ]; - - patches = [ - ./qtcurve-1.8.18-install-paths.patch - ./qtcurve-1.8.18-toolbar-alpha.patch - ]; - - cmakeFlags = '' - -DENABLE_QT5=OFF - -DQTC_QT4_ENABLE_KWIN=ON - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/QtCurve/qtcurve; - description = "Widget styles for Qt4/KDE4 and gtk2"; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.ttuegel ]; - }; -} diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch deleted file mode 100644 index 345ac25bbbb0..000000000000 --- a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2be588..4cb9115 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -116,6 +116,7 @@ if(ENABLE_GTK2) - find_package(PkgConfig REQUIRED) - unset(__pkg_config_checked_GTK2 CACHE) - pkg_check_modules(GTK2 REQUIRED gtk+-2.0) -+ set(GTK2_THEME_PREFIX "${CMAKE_INSTALL_PREFIX}") - if(GTK2_THEME_PREFIX) - set(GTK2_PREFIX "${GTK2_THEME_PREFIX}") - elseif(NOT GTK2_PREFIX) -diff --git a/gtk2/style/CMakeLists.txt b/gtk2/style/CMakeLists.txt -index 01e8891..a2c767e 100644 ---- a/gtk2/style/CMakeLists.txt -+++ b/gtk2/style/CMakeLists.txt -@@ -88,6 +88,6 @@ target_link_libraries(qtcurve-gtk2 - qtcurve-utils qtcurve-cairo m) - - install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION -- ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines) -+ lib/gtk-2.0/${GTK2_BIN_VERSION}/engines) - install(FILES gtkrc icons3 icons4 map_kde_icons.pl kdeglobals - DESTINATION ${GTK2_THEME_DIR}/gtk-2.0) diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch deleted file mode 100644 index 85400e6f0f67..000000000000 --- a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/qt4/style/qtcurve.cpp b/qt4/style/qtcurve.cpp -index d7659f5..aede882 100644 ---- a/qt4/style/qtcurve.cpp -+++ b/qt4/style/qtcurve.cpp -@@ -12436,7 +12436,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p, - if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) || - (menu && SHADE_NONE != opts.shadeMenubars)) { - p->save(); -+#if 0 -+ // Revert for now -+ // This is necessary for correct opacity on the menubar but may -+ // break transparent gradient. - p->setCompositionMode(QPainter::CompositionMode_Source); -+#endif - QRect rx(r); - QColor col(menu && (option->state & State_Enabled || - SHADE_NONE != opts.shadeMenubars) ? -diff --git a/qt5/style/qtcurve.cpp b/qt5/style/qtcurve.cpp -index c43b8a3..135eddc 100644 ---- a/qt5/style/qtcurve.cpp -+++ b/qt5/style/qtcurve.cpp -@@ -3398,7 +3398,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p, - if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) || - (menu && opts.shadeMenubars != SHADE_NONE)) { - p->save(); -+#if 0 -+ // Revert for now -+ // This is necessary for correct opacity on the menubar but may -+ // break transparent gradient. - p->setCompositionMode(QPainter::CompositionMode_Source); -+#endif - QRect rx(r); - QColor col(menu && (option->state & State_Enabled || - opts.shadeMenubars != SHADE_NONE) ? -- cgit 1.4.1 From f344817a3ece8284826fe6852e80c161644f340b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 18 Feb 2017 13:02:26 -0600 Subject: Remove Oxygen GTK themes - Not useful without the KDE 4 desktop --- pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 24 ------------------------ pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix | 23 ----------------------- pkgs/top-level/all-packages.nix | 6 ------ 3 files changed, 53 deletions(-) delete mode 100644 pkgs/misc/themes/gtk2/oxygen-gtk/default.nix delete mode 100644 pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix (limited to 'pkgs/misc/themes') diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix deleted file mode 100644 index ad13b5f17ab6..000000000000 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, - cmake, dbus_glib, glib, gtk2, gdk_pixbuf, pkgconfig, xorg }: - -stdenv.mkDerivation rec { - version = "1.4.6"; - name = "oxygen-gtk2-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "09mz4szsz3yswbj0nbw6qzlc5bc4id0f9r6ifm60b5nc8x1l72d2"; - }; - - buildInputs = [ cmake dbus_glib glib gtk2 gdk_pixbuf - pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs - xorg.libxcb xorg.pixman ]; - - meta = with stdenv.lib; { - description = "Port of the default KDE widget theme (Oxygen), to gtk"; - homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk; - license = licenses.lgpl2; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix b/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix deleted file mode 100644 index 2cceee62447d..000000000000 --- a/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl -, cmake, dbus_glib, glib, gtk3, gdk_pixbuf, pkgconfig, xorg }: - -stdenv.mkDerivation rec { - version = "1.4.1"; - name = "oxygen-gtk3-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/oxygen-gtk3/${version}/src/${name}.tar.bz2"; - sha256 = "0pd7wjzh5xgd24yg6b2avaiz1aq6rmh13d7c0jclffkmhmy24r0f"; - }; - - buildInputs = [ cmake dbus_glib glib gtk3 gdk_pixbuf - pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs - xorg.libxcb xorg.pixman ]; - - meta = with stdenv.lib; { - description = "Port of the default KDE widget theme (Oxygen), to gtk 3"; - homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed2d9c99d06a..f5ce3e6a8760 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16802,12 +16802,6 @@ with pkgs; albatross = callPackage ../misc/themes/albatross { }; - oxygen-gtk2 = callPackage ../misc/themes/gtk2/oxygen-gtk { }; - - oxygen-gtk3 = callPackage ../misc/themes/gtk3/oxygen-gtk3 { }; - - oxygen_gtk = oxygen-gtk2; # backwards compatibility - gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { }; -- cgit 1.4.1