Ticket #57332: kde4-workspace.diff

File kde4-workspace.diff, 15.2 KB (added by RJVB (René Bertin), 6 years ago)

port dir diff

  • kde/kde4-workspace/Portfile 

    diff --git a/kde/kde4-workspace/Portfile b/kde/kde4-workspace/Portfile
index c78470e38d..337b31a0fb 100644
    a b PortGroup kde4 1.1 
    55
    66fetch.type          git
    77git.url             git://anongit.kde.org/kde-workspace
    8 git.branch          b904af16
     8git.branch          100800e799b062914fd2e6f517643effaca40ae7
    99
    1010name                kde4-workspace
    11 version             4.14.4.20150324
    12 revision            5
    13 set plasmaversion   4.11.17
     11version             4.14.4.20150831
     12set plasmaversion   4.11.22-6
    1413categories          kde kde4
    1514maintainers         {gmail.com:rjvbertin @RJVB}
    1615license             GPL-2+ LGPL-2.1+
    … … use_xz yes 
    2827#                    sha256  09d8ae1ac1b704fc919bdedfec47c6561033dca125b0096cb9ed398445fa942f
    2928
    3029patchfiles          patch-CMakeLists-for-OSX.patch \
    31                     patch-libs-CMakeLists.patch \
    3230                    patch-kcontrol.patch \
    33                     systemsettings-correct-menuplacement.patch
     31                    systemsettings-correct-menuplacement.patch \
     32                    patch-input-wheelzooms.diff
    3433
    3534depends_build-append port:boost \
    3635                    port:freetype \
    3736                    port:libusb
    3837
    3938depends_lib-append  port:kdelibs4 \
    40                     port:kdepimlibs4 \
     39                    path:lib/libakonadi-calendar.4.dylib:kdepimlibs4 \
    4140                    port:kactivities \
    4241                    port:nepomuk-core \
    4342                    port:libqalculate \
    4443                    port:qjson \
    4544                    port:qimageblitz
    4645
    47 configure.args-append  -DBUILD_webkit:BOOL=ON
     46configure.args-append \
     47                    -DBUILD_webkit:BOOL=ON \
     48                    -DBUILD_OXYGEN=ON
    4849
    4950configure.args-delete -DCMAKE_BUILD_TYPE=Release
    5051configure.args-append -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_STRIP:FILEPATH=/bin/echo
    5152
    52 variant oxygen description {Build the Oxygen theme} {
    53     patchfiles-append     no-oxygen-theme.patch
     53variant oxygen description {Build the Oxygen theme} {}
     54default_variants    +oxygen
     55
     56if {![variant_isset oxygen]} {
     57    configure.args-replace \
     58                    -DBUILD_OXYGEN=ON \
     59                    -DBUILD_OXYGEN=OFF
    5460}
    5561
    56 default_variants    +oxygen
     62# maintainer convience: let the build go as far as possible to collect as
     63# many errors as possible (if any) in a single pass.
     64build.post_args-append \
     65                    -k
    5766
    5867post-destroot {
    5968    ln -s ${applications_dir}/KDE4/plasma-windowed.app/Contents/MacOS/plasma-windowed ${destroot}${prefix}/bin/plasma-windowed

  • deleted file kde/kde4-workspace/files/no-oxygen-theme.patch 

    diff --git a/kde/kde4-workspace/files/no-oxygen-theme.patch b/kde/kde4-workspace/files/no-oxygen-theme.patch
deleted file mode 100644
index 59a598348b..0000000000
    + -  
    1 --- kstyles/orig.CMakeLists.txt 2014-10-03 18:30:13.000000000 +0200
    2 +++ kstyles/CMakeLists.txt      2014-10-08 11:57:14.000000000 +0200
    3 @@ -1,2 +1,2 @@
    4 -add_subdirectory( oxygen )
    5 +# add_subdirectory( oxygen )
    6  add_subdirectory( themes )
    7 --- libs/oxy.CMakeLists.txt     2014-12-30 13:32:17.000000000 +0100
    8 +++ libs/CMakeLists.txt 2014-12-30 14:25:25.000000000 +0100
    9 @@ -1,6 +1,6 @@
    10  add_subdirectory(kephal)
    11  add_subdirectory(kworkspace)
    12 -add_subdirectory(oxygen)
    13 +#add_subdirectory(oxygen)
    14  add_subdirectory(plasmaclock)
    15  
    16  if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")

  • kde/kde4-workspace/files/patch-CMakeLists-for-OSX.patch 

    diff --git a/kde/kde4-workspace/files/patch-CMakeLists-for-OSX.patch b/kde/kde4-workspace/files/patch-CMakeLists-for-OSX.patch
old mode 100644
new mode 100755
index 5b43f06622..a575402222
    a b  
    1 --- orig.CMakeLists.txt 2014-09-19 14:30:04.000000000 +0200
    2 +++ CMakeLists.txt      2014-10-03 18:55:38.000000000 +0200
    3 @@ -194,7 +194,7 @@
     1diff --git CMakeLists.txt CMakeLists.txt
     2index 3d4287c..273dcdd 100644
     3--- CMakeLists.txt
     4+++ CMakeLists.txt
     5@@ -19,6 +19,7 @@ find_package(KDE4 4.9.4 REQUIRED)
     6 include(KDE4Defaults)
     7 
     8 option(WITH_XINERAMA "Xinerama support for multi-headed X displays" ON)
     9+option(BUILD_OXYGEN "Build the Oxygen style for Qt4/KDE4" ON)
     10 
     11 find_package(Strigi)
     12 
     13@@ -194,7 +195,7 @@ set_package_properties(QJSON PROPERTIES DESCRIPTION "Library to manage JSON obje
    414 
    515 
    616 include(ConfigureChecks.cmake)
    … …  
    919   configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
    1020   configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
    1121   if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
    12 @@ -221,15 +221,17 @@
     22@@ -221,15 +222,17 @@ endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
    1323 
    1424 # core apps
    1525 if(NOT WIN32)
    1626-   macro_optional_add_subdirectory( kcheckpass )
    1727-   macro_optional_add_subdirectory( kwin )
    1828-   macro_optional_add_subdirectory( ksmserver )
    19 -
    20 -   find_package(JPEG REQUIRED)
    21 -   find_package(PNG REQUIRED)
    22 -   macro_optional_add_subdirectory( ksplash )
    2329+   if(NOT APPLE)
    2430+      macro_optional_add_subdirectory( kcheckpass )
    2531+      macro_optional_add_subdirectory( kwin )
    2632+      macro_optional_add_subdirectory( ksmserver )
    27 +
     33 
     34-   find_package(JPEG REQUIRED)
     35-   find_package(PNG REQUIRED)
     36-   macro_optional_add_subdirectory( ksplash )
    2837+      find_package(JPEG REQUIRED)
    2938+      find_package(PNG REQUIRED)
    3039+      macro_optional_add_subdirectory( ksplash )
    … …  
    3544    macro_optional_add_subdirectory( qguiplatformplugin_kde )
    3645    if (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
    3746       macro_optional_add_subdirectory( ksysguard )
    38 @@ -238,14 +240,16 @@
     47@@ -238,14 +241,16 @@ endif(NOT WIN32)
    3948 
    4049 if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
    4150    macro_optional_add_subdirectory(kcontrol)
    … …  
    6069 
    6170    # data
    6271    macro_optional_add_subdirectory(doc)
    63 @@ -254,7 +258,7 @@
     72@@ -254,7 +259,7 @@ if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
    6473       macro_optional_add_subdirectory(ktouchpadenabler)
    6574    endif (Q_WS_X11)
    6675 
    … …  
    6978       macro_optional_add_subdirectory(kcminit)
    7079       macro_optional_add_subdirectory(khotkeys)
    7180       macro_optional_add_subdirectory(kwrited)
    72 @@ -269,17 +273,19 @@
     81@@ -269,17 +274,19 @@ if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
    7382    endif(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
    7483 endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
    7584 
    … …  
    8190 
    8291-macro_optional_add_subdirectory(plasma)
    8392+if(NOT APPLE)
    84 +   macro_optional_add_subdirectory(plasma)
    85 +endif(NOT APPLE)
     93+    macro_optional_add_subdirectory(plasma)
     94+endif()
    8695 macro_optional_add_subdirectory(statusnotifierwatcher)
    8796 macro_optional_add_subdirectory(kstyles)
    8897 
    … …  
    92101   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/startkde DESTINATION ${BIN_INSTALL_DIR})
    93102 endif(NOT WIN32)
    94103 
     104@@ -352,9 +359,11 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake
     105               ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake
     106         DESTINATION ${_KDE4WorkspaceConfig_INSTALL_DIR})
     107 
     108-install(EXPORT kdeworkspaceLibraryTargets
     109+if(NOT APPLE)
     110+    install(EXPORT kdeworkspaceLibraryTargets
     111         NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX}
     112         DESTINATION ${_KDE4WorkspaceConfig_INSTALL_DIR}
     113         FILE KDE4WorkspaceLibraryTargets.cmake )
     114+endif()
     115 
     116 
     117diff --git libs/CMakeLists.txt libs/CMakeLists.txt
     118index c0576fe6e77eedd71ec548c8cf38dda819dfaa99..0f522ab59b1928d1e63f561b3b98e06d4d703910 100644
     119--- libs/CMakeLists.txt
     120+++ libs/CMakeLists.txt
     121@@ -1,19 +1,20 @@
     122-add_subdirectory(kephal)
     123-add_subdirectory(kworkspace)
     124-add_subdirectory(oxygen)
     125-add_subdirectory(plasmaclock)
     126+if(NOT APPLE)
     127+    add_subdirectory(kephal)
     128+    add_subdirectory(kworkspace)
     129+    add_subdirectory(plasmaclock)
     130 
     131-if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
     132-   add_subdirectory(kdm)
     133-   add_subdirectory(plasmagenericshell)
     134-   if(NOT WIN32)
     135-        add_subdirectory(taskmanager)
     136-   endif(NOT WIN32)
     137-endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
     138+    if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
     139+       add_subdirectory(kdm)
     140+       add_subdirectory(plasmagenericshell)
     141+       if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
     142+            add_subdirectory(taskmanager)
     143+       endif(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
     144+    endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
     145 
     146-if(NOT WIN32)
     147-    if (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
     148+    if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
     149         add_subdirectory(ksysguard)
     150-    endif (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
     151-endif(NOT WIN32)
     152-
     153+    endif(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
     154+endif()
     155+if(BUILD_OXYGEN)
     156+    add_subdirectory(oxygen)
     157+endif()
     158diff --git kstyles/CMakeLists.txt kstyles/CMakeLists.txt
     159index 260f65b784121c3455e1a3e129d92fe37f30d12b..34585c6e46be2fb465f1cce9a41f63e42f2d05fb 100644
     160--- kstyles/CMakeLists.txt
     161+++ kstyles/CMakeLists.txt
     162@@ -1,2 +1,4 @@
     163-add_subdirectory( oxygen )
     164+if(BUILD_OXYGEN)
     165+    add_subdirectory( oxygen )
     166+endif()
     167 add_subdirectory( themes )

  • new file kde/kde4-workspace/files/patch-input-wheelzooms.diff 

    diff --git a/kde/kde4-workspace/files/patch-input-wheelzooms.diff b/kde/kde4-workspace/files/patch-input-wheelzooms.diff
new file mode 100644
index 0000000000..c3035ca700
    - +  
     1diff --git kcontrol/input/kmousedlg.ui kcontrol/input/kmousedlg.ui
     2index b48a606..c2dde85 100644
     3--- kcontrol/input/kmousedlg.ui
     4+++ kcontrol/input/kmousedlg.ui
     5@@ -76,6 +76,16 @@
     6          </property>
     7         </widget>
     8        </item>
     9+       <item>
     10+        <widget class="QCheckBox" name="cbWheelZooms">
     11+         <property name="whatsThis">
     12+          <string>Scrolling with the mouse wheel with the Control (or Command) key may zoom text, or else may accelerate the scrolling.</string>
     13+         </property>
     14+         <property name="text">
     15+          <string>Mo&amp;use wheel may zoom text</string>
     16+         </property>
     17+        </widget>
     18+       </item>
     19       </layout>
     20      </item>
     21      <item>
     22@@ -249,6 +259,7 @@
     23   <tabstop>rightHanded</tabstop>
     24   <tabstop>leftHanded</tabstop>
     25   <tabstop>cbScrollPolarity</tabstop>
     26+  <tabstop>cbWheelZooms</tabstop>
     27   <tabstop>doubleClick</tabstop>
     28   <tabstop>singleClick</tabstop>
     29   <tabstop>cb_pointershape</tabstop>
     30diff --git kcontrol/input/mouse.cpp kcontrol/input/mouse.cpp
     31index cebb174..d65db1c 100644
     32--- kcontrol/input/mouse.cpp
     33+++ kcontrol/input/mouse.cpp
     34@@ -180,6 +180,9 @@ MouseConfig::MouseConfig(QWidget *parent, const QVariantList &args)
     35     connect(generalTab->cbScrollPolarity, SIGNAL(clicked()), this, SLOT(changed()));
     36     connect(generalTab->cbScrollPolarity, SIGNAL(clicked()), this, SLOT(slotScrollPolarityChanged()));
     37 
     38+    connect(generalTab->cbWheelZooms, SIGNAL(clicked()), this, SLOT(changed()));
     39+    connect(generalTab->cbWheelZooms, SIGNAL(clicked()), this, SLOT(slotWheelZoomsChanged()));
     40+
     41     // Advanced tab
     42     advancedTab = new QWidget(0);
     43     advancedTab->setObjectName("Advanced Tab");
     44@@ -457,6 +460,7 @@ void MouseConfig::load()
     45   if ( generalTab->cbScrollPolarity->isEnabled() )
     46     generalTab->cbScrollPolarity->setEnabled(settings->handedEnabled);
     47   generalTab->cbScrollPolarity->setChecked( settings->reverseScrollPolarity );
     48+  generalTab->cbWheelZooms->setChecked( settings->wheelZooms );
     49 
     50   setAccel(settings->accelRate);
     51   setThreshold(settings->thresholdMove);
     52@@ -524,6 +528,7 @@ void MouseConfig::save()
     53 //  settings->changeCursor = generalTab->singleClick->isChecked();
     54   settings->changeCursor = generalTab->cb_pointershape->isChecked();
     55   settings->reverseScrollPolarity = generalTab->cbScrollPolarity->isChecked();
     56+  settings->wheelZooms = generalTab->cbWheelZooms->isChecked();
     57 
     58   settings->apply();
     59   KConfig config( "kcminputrc" );
     60@@ -568,6 +573,7 @@ void MouseConfig::defaults()
     61     generalTab->slAutoSelect->setValue( KDE_DEFAULT_AUTOSELECTDELAY == -1 ? 50 : KDE_DEFAULT_AUTOSELECTDELAY );
     62     generalTab->singleClick->setChecked( KDE_DEFAULT_SINGLECLICK );
     63     generalTab->cb_pointershape->setChecked(KDE_DEFAULT_CHANGECURSOR);
     64+    generalTab->cbWheelZooms->setChecked(KDE_DEFAULT_WHEEL_ZOOM);
     65     slotClick();
     66 
     67   mouseKeys->setChecked(false);
     68@@ -681,6 +687,7 @@ void MouseSettings::load(KConfig *config)
     69   singleClick = group.readEntry("SingleClick", KDE_DEFAULT_SINGLECLICK);
     70   autoSelectDelay = group.readEntry("AutoSelectDelay", KDE_DEFAULT_AUTOSELECTDELAY);
     71   changeCursor = group.readEntry("ChangeCursor", KDE_DEFAULT_CHANGECURSOR);
     72+  wheelZooms = group.readEntry("WheelMouseZooms", KDE_DEFAULT_WHEEL_ZOOM );
     73 }
     74 
     75 void MouseConfig::slotThreshChanged(int value)
     76@@ -796,6 +803,7 @@ void MouseSettings::save(KConfig *config)
     77   group.writeEntry("SingleClick", singleClick, KConfig::Persistent|KConfig::Global);
     78   group.writeEntry("AutoSelectDelay", autoSelectDelay, KConfig::Persistent|KConfig::Global);
     79   group.writeEntry("ChangeCursor", changeCursor,KConfig::Persistent|KConfig::Global);
     80+  group.writeEntry("WheelMouseZooms", wheelZooms, KConfig::Persistent|KConfig::Global);
     81   // This iterates through the various Logitech mice, if we have support.
     82 #ifdef HAVE_LIBUSB
     83   LogitechMouse *logitechMouse;
     84@@ -812,6 +820,11 @@ void MouseConfig::slotScrollPolarityChanged()
     85   settings->m_handedNeedsApply = true;
     86 }
     87 
     88+void MouseConfig::slotWheelZoomsChanged()
     89+{
     90+  settings->wheelZooms = generalTab->cbWheelZooms->isChecked();
     91+}
     92+
     93 void MouseConfig::slotSmartSliderEnabling()
     94 {
     95   bool enabled = generalTab->singleClick->isChecked() ? generalTab->cbAutoSelect->isChecked() : false;
     96diff --git kcontrol/input/mouse.h kcontrol/input/mouse.h
     97index d926a99..dcc160f 100644
     98--- kcontrol/input/mouse.h
     99+++ kcontrol/input/mouse.h
     100@@ -88,6 +88,7 @@ public:
     101  bool changeCursor;
     102  int wheelScrollLines;
     103  bool reverseScrollPolarity;
     104+ bool wheelZooms;
     105 
     106  #ifdef HAVE_LIBUSB
     107  // TODO: In Qt4, replace with a better container.
     108@@ -112,6 +113,7 @@ private Q_SLOTS:
     109   /** No descriptions */
     110   void slotHandedChanged(int val);
     111   void slotScrollPolarityChanged();
     112+  void slotWheelZoomsChanged();
     113   void checkAccess();
     114   void slotThreshChanged(int value);
     115   void slotDragStartDistChanged(int value);

  • deleted file kde/kde4-workspace/files/patch-libs-CMakeLists.patch 

    diff --git a/kde/kde4-workspace/files/patch-libs-CMakeLists.patch b/kde/kde4-workspace/files/patch-libs-CMakeLists.patch
deleted file mode 100644
index 10d5a027e8..0000000000
    + -  
    1 diff --git libs/CMakeLists.txt libs/CMakeLists.txt
    2 index c0576fe..1a34bca 100644
    3 --- libs/CMakeLists.txt
    4 +++ libs/CMakeLists.txt
    5 @@ -6,14 +6,12 @@ add_subdirectory(plasmaclock)
    6  if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
    7     add_subdirectory(kdm)
    8     add_subdirectory(plasmagenericshell)
    9 -   if(NOT WIN32)
    10 +   if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
    11          add_subdirectory(taskmanager)
    12 -   endif(NOT WIN32)
    13 +   endif(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
    14  endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
    15  
    16 -if(NOT WIN32)
    17 -    if (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
    18 -        add_subdirectory(ksysguard)
    19 -    endif (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
    20 -endif(NOT WIN32)
    21 +if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
    22 +    add_subdirectory(ksysguard)
    23 +endif(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
    24  
    25