Remove kde4.qtcurve
- Not useful without the KDE 4 desktop
This commit is contained in:
parent
dab94220fa
commit
25378a6aa0
@ -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 ];
|
||||
};
|
||||
}
|
@ -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)
|
@ -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) ?
|
@ -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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user