summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-02-18 13:01:32 -0600
committerThomas Tuegel <ttuegel@mailbox.org>2017-02-24 16:49:01 -0600
commit25378a6aa0b8601044175b4648bb3db83971659b (patch)
tree4c24a556fdc1a3b85dda6e519445c8561781927d
parentdab94220faff4ed8c4e90d74fce80087880d3fdc (diff)
downloadnixlib-25378a6aa0b8601044175b4648bb3db83971659b.tar
nixlib-25378a6aa0b8601044175b4648bb3db83971659b.tar.gz
nixlib-25378a6aa0b8601044175b4648bb3db83971659b.tar.bz2
nixlib-25378a6aa0b8601044175b4648bb3db83971659b.tar.lz
nixlib-25378a6aa0b8601044175b4648bb3db83971659b.tar.xz
nixlib-25378a6aa0b8601044175b4648bb3db83971659b.tar.zst
nixlib-25378a6aa0b8601044175b4648bb3db83971659b.zip
Remove kde4.qtcurve
- Not useful without the KDE 4 desktop
-rw-r--r--pkgs/misc/themes/qtcurve/default.nix43
-rw-r--r--pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch24
-rw-r--r--pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch34
-rw-r--r--pkgs/top-level/all-packages.nix2
4 files changed, 0 insertions, 103 deletions
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) ?
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c935b400aea..ed2d9c99d06a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16761,8 +16761,6 @@ with pkgs;
 
         psi = callPackage ../applications/networking/instant-messengers/psi { };
 
-        qtcurve = callPackage ../misc/themes/qtcurve { };
-
         rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { };
         rekonq = wrapFirefox rekonq-unwrapped { };