Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d4b54b780a8dd434eaf4c4e046432ea3d07e0432)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d4b54b780a8dd434eaf4c4e046432ea3d07e0432)
  • Date: Wed, 22 Jun 2016 14:40:26 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3
graphics-libs/libpng/DETAILS | 6 -
graphics-libs/libpng/HISTORY | 3
http/qupzilla/BUILD | 6 -
http/qupzilla/DEPENDS | 7 -
http/qupzilla/DETAILS | 13 ---
http/qupzilla/HISTORY | 11 --
plasma/powerdevil/DEPENDS | 3
plasma/powerdevil/HISTORY | 4 +
plasma/powerdevil/PRE_BUILD | 3
plasma/powerdevil/power.diff | 149
++++++++++++++++++++++++++++++++++++++
qt5-deprecated/qtwebkit/CONFLICTS | 1
qt5-deprecated/qtwebkit/HISTORY | 4 +
qt5-deprecated/qtwebkit/PROVIDES | 1
qt5-qmake/qupzilla/DEPENDS | 3
qt5-qmake/qupzilla/DETAILS | 13 +++
qt5-qmake/qupzilla/HISTORY | 16 ++++
17 files changed, 206 insertions(+), 40 deletions(-)

New commits:
commit d4b54b780a8dd434eaf4c4e046432ea3d07e0432
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.23

commit fae12545e0afaf446ff04e3c29226f1de7db1f0b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

powerdevil - reduce depends

commit ca8d274fe977846b6f0c8ae3377a3b3b16a77058
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qupzilla: => 2.0.1

commit 0351965672dce93543ce2ac19820ec23dbeb1586
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtwebkit - tweak

diff --git a/ChangeLog b/ChangeLog
index 0b32e9b..4297200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2016-06-21 Pavel Vinogradov <public AT sourcemage.org>
* chat-im/purple-vk-plugin: new spell, VK plugin for Pidgin

+2016-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * qupzilla: moved to qt5-qmake, now qt5 only
+
2016-06-17 Vlad Glagolev <stealth AT sourcemage.org>
* utils/sysdig: new spell, Linux system exploration and
troubleshooting
tool
diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index a96d052..1d1a7f6 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,12 +1,12 @@
SPELL=libpng
- VERSION=1.6.22
-
SOURCE_HASH=sha512:48b11123661c382273d033371907347aec53d405e9e31e92a32ed77cf5d154bc720e2047a52b670cb4421c92d4a706a00cc1f73a25cd41a766fa2f2b75acc51c
+ VERSION=1.6.23
+
SOURCE_HASH=sha512:950e2fae24db1e53e80257b34a78d3708844551c460d84902becea2bb246cddb1bb581c1e1faadbe2cac45c4182051558554748c78964ab74d27a65998a31c18
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[1]=ftp://ftp.simplesystems.org/pub/png/src/libpng16/${SOURCE}

SOURCE_URL[0]=http://downloads.sourceforge.net/project/libpng/libpng16/${VERSION}/${SOURCE}
if [[ $ANI_PNG == y ]]; then
SOURCE2=$SPELL-$VERSION-apng.patch.gz
-
SOURCE2_HASH=sha512:d55f51cccf99748cd68d469dd83db25b2913242f7019e7fb97b635b1a639ef7349055884e94155fb5805046d1f9b6e90e29de2bf08f38af691deb6c58e229016
+
SOURCE2_HASH=sha512:105e7f70d1292f4a059e62fda7c4ffbfcd4eacd3c11cd1fbdd09bdcf2b1469a54ee864c4f5f22afe9e17ddfd1d10196661a69bb4eb469173a3bfc789181923ce

SOURCE2_URL[0]=http://downloads.sourceforge.net/project/libpng-apng/libpng16/${VERSION}/${SOURCE2}
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index e3e56a9..56c0ff1 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,6 @@
+2016-06-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.23
+
2016-06-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.22

diff --git a/http/qupzilla/BUILD b/http/qupzilla/BUILD
deleted file mode 100755
index a839ab4..0000000
--- a/http/qupzilla/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-if is_depends_enabled $SPELL qtbase;then
- qt5_build
-else
- qt4_build
-fi
-
diff --git a/http/qupzilla/DEPENDS b/http/qupzilla/DEPENDS
deleted file mode 100755
index c310a47..0000000
--- a/http/qupzilla/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-depends -sub CXX gcc &&
-depends QT &&
-if is_depends_enabled $SPELL qtbase;then
- depends qtwebkit5
-else
- sub_depends qt4 WEBKIT
-fi
diff --git a/http/qupzilla/DETAILS b/http/qupzilla/DETAILS
deleted file mode 100755
index d87bbf2..0000000
--- a/http/qupzilla/DETAILS
+++ /dev/null
@@ -1,13 +0,0 @@
- SPELL=qupzilla
- VERSION=1.6.1
-
SOURCE_HASH=sha512:30bc06aefdd3d92b6890f69f954c7ec4e0663fe832819f5c3b6bfc9ee6adc2cfbb585ec7b473ecf0efb3521b5c7527a928646667e3a411328b64eb2ac5977a38
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=https://github.com/QupZilla/qupzilla/archive/v${VERSION}.tar.gz
- WEB_SITE=http://www.qupzilla.com/
- LICENSE[0]=GPL
- ENTERED=20140120
- SHORT="web browser based on WebKit core and Qt Framework"
-cat << EOF
-QupZilla is modern web browser based on WebKit core and Qt Framework.
-EOF
diff --git a/http/qupzilla/HISTORY b/http/qupzilla/HISTORY
deleted file mode 100644
index 341ddf7..0000000
--- a/http/qupzilla/HISTORY
+++ /dev/null
@@ -1,11 +0,0 @@
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: depends -sub CXX gcc (half-automated)
-
-2014-02-04 Treeve Jelbert <treeve AT sourcemage.org>
- * BUILD, DEPENDS: add qt5 support
-
-2014-02-04 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.6.1
-
-2014-01-20 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS, DEPENDS: spell created, version 1.6.0
diff --git a/plasma/powerdevil/DEPENDS b/plasma/powerdevil/DEPENDS
index 61d9563..475af32 100755
--- a/plasma/powerdevil/DEPENDS
+++ b/plasma/powerdevil/DEPENDS
@@ -18,5 +18,8 @@ depends xcb-util-wm &&
depends pkgconfig &&
depends DEVICE-MANAGER &&

+optional_depends networkmanager-qt '' '' 'manage wireless power' &&
+optional_depends bluez-qt '' '' 'manage Bluetooh power' &&
+
suggest_depends upower-suspend '' '' 'runtime suspend/hibernate' &&
suggest_depends consolekit2 '' '' 'runtime power management'
diff --git a/plasma/powerdevil/HISTORY b/plasma/powerdevil/HISTORY
index f903b7d..0008d36 100644
--- a/plasma/powerdevil/HISTORY
+++ b/plasma/powerdevil/HISTORY
@@ -1,3 +1,7 @@
+2016-06-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, power.diff: added - upstream pathc to reduce depends
+ * DEPENDS: add networkmanager-qt, bluez-qt
+
2016-06-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: add gpg checking

diff --git a/plasma/powerdevil/PRE_BUILD b/plasma/powerdevil/PRE_BUILD
new file mode 100755
index 0000000..42f2a6d
--- /dev/null
+++ b/plasma/powerdevil/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/power.diff
diff --git a/plasma/powerdevil/power.diff b/plasma/powerdevil/power.diff
new file mode 100644
index 0000000..2cd981b
--- /dev/null
+++ b/plasma/powerdevil/power.diff
@@ -0,0 +1,149 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6b631b4..6117f75 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,9 +22,32 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ endif()
+
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets DBus
X11Extras)
+-find_package(KF5 REQUIRED COMPONENTS Activities Auth IdleTime Config
DBusAddons Solid I18n GlobalAccel KIO NotifyConfig Screen KDELibs4Support
Wayland NetworkManagerQt BluezQt)
++find_package(KF5 REQUIRED COMPONENTS Activities Auth IdleTime Config
DBusAddons Solid I18n GlobalAccel KIO NotifyConfig Screen KDELibs4Support
Wayland)
+ find_package(LibKWorkspace CONFIG REQUIRED)
+
++find_package(KF5BluezQt)
++set_package_properties(KF5BluezQt
++ PROPERTIES DESCRIPTION "Qt wrapper for BlueZ 5 DBus API"
++ TYPE OPTIONAL
++ PURPOSE "Support for wireless energy saving actions"
++)
++find_package(KF5NetworkManagerQt)
++set_package_properties(KF5NetworkManagerQt
++ PROPERTIES DESCRIPTION "Qt wrapper for NetworkManager API"
++ TYPE OPTIONAL
++ PURPOSE "Support for wireless energy saving actions"
++)
++
++set(HAVE_WIRELESS_SUPPORT FALSE)
++if(KF5NetworkManagerQt_FOUND AND KF5BluezQt_FOUND)
++ set(HAVE_WIRELESS_SUPPORT TRUE)
++endif()
++add_feature_info(
++ "Wireless power saving"
++ HAVE_WIRELESS_SUPPORT
++ "Support turning off signal-transmitting devices to save energy"
++)
++
+ find_package(UDev REQUIRED)
+
+ find_package(XCB REQUIRED COMPONENTS XCB RANDR DPMS)
+diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
+index 4b0aafd..9c9b897 100644
+--- a/daemon/CMakeLists.txt
++++ b/daemon/CMakeLists.txt
+@@ -19,9 +19,14 @@ set(powerdevil_bundled_actions_SRCS
+ actions/bundled/dimdisplay.cpp
+ actions/bundled/runscript.cpp
+ actions/bundled/handlebuttonevents.cpp
+- actions/bundled/wirelesspowersaving.cpp
+ )
+
++if(HAVE_WIRELESS_SUPPORT)
++ set(powerdevil_bundled_actions_SRCS ${powerdevil_bundled_actions_SRCS}
++ actions/bundled/wirelesspowersaving.cpp
++ )
++endif()
++
+ # target no.1 - powerdevil core library
+ set(powerdevilcore_SRCS
+ powerdevil_debug.cpp
+@@ -49,8 +54,10 @@ qt5_add_dbus_adaptor(powerdevilcore_SRCS
actions/bundled/org.kde.Solid.PowerMana
+ actions/bundled/handlebuttonevents.h
PowerDevil::BundledActions::HandleButtonEvents)
+ qt5_add_dbus_adaptor(powerdevilcore_SRCS
actions/bundled/org.kde.Solid.PowerManagement.Actions.SuspendSession.xml
+ actions/bundled/suspendsession.h
PowerDevil::BundledActions::SuspendSession)
+-qt5_add_dbus_adaptor(powerdevilcore_SRCS
actions/bundled/org.kde.Solid.PowerManagement.Actions.WirelessPowerSaving.xml
+- actions/bundled/wirelesspowersaving.h
PowerDevil::BundledActions::WirelessPowerSaving)
++if(HAVE_WIRELESS_SUPPORT)
++ qt5_add_dbus_adaptor(powerdevilcore_SRCS
actions/bundled/org.kde.Solid.PowerManagement.Actions.WirelessPowerSaving.xml
++ actions/bundled/wirelesspowersaving.h
PowerDevil::BundledActions::WirelessPowerSaving)
++endif()
+
+ add_library(powerdevilcore SHARED ${powerdevilcore_SRCS}
${powerdevil_bundled_actions_SRCS})
+ set_target_properties(powerdevilcore PROPERTIES VERSION
${POWERDEVIL_CORE_VERSION_STRING} SOVERSION ${POWERDEVIL_CORE_VERSION_MAJOR})
+@@ -70,11 +77,16 @@ target_link_libraries(powerdevilcore
+ KF5::WidgetsAddons
+ KF5::Notifications
+ KF5::XmlGui
+- KF5::NetworkManagerQt
+- KF5::BluezQt
+ PW::KWorkspace
+ )
+
++if(HAVE_WIRELESS_SUPPORT)
++ target_link_libraries(powerdevilcore
++ KF5::NetworkManagerQt
++ KF5::BluezQt
++ )
++endif()
++
+ if (XCB_FOUND) # kwin kscreen helper effect
+ target_link_libraries(powerdevilcore Qt5::X11Extras XCB::XCB)
+ endif ()
+diff --git a/daemon/actions/bundled/CMakeLists.txt
b/daemon/actions/bundled/CMakeLists.txt
+index e3e8eeb..9623b57 100644
+--- a/daemon/actions/bundled/CMakeLists.txt
++++ b/daemon/actions/bundled/CMakeLists.txt
+@@ -19,8 +19,9 @@ add_powerdevil_bundled_action(keyboardbrightnesscontrol)
+ add_powerdevil_bundled_action(dimdisplay)
+ add_powerdevil_bundled_action(runscript KF5::KIOCore KF5::KIOWidgets)
+ add_powerdevil_bundled_action(suspendsession KF5::KIOCore KF5::KIOWidgets
KF5::Solid KF5::KDELibs4Support)
+-add_powerdevil_bundled_action(wirelesspowersaving KF5::NetworkManagerQt
KF5::BluezQt)
+-
++if(HAVE_WIRELESS_SUPPORT)
++ add_powerdevil_bundled_action(wirelesspowersaving KF5::NetworkManagerQt
KF5::BluezQt)
++endif()
+
+ set(actionconfig_SRCS handlebuttoneventsconfig.cpp)
+ qt5_add_dbus_interface(actionconfig_SRCS
+diff --git a/daemon/config-powerdevil.h.cmake
b/daemon/config-powerdevil.h.cmake
+index 62938dc..042317d 100644
+--- a/daemon/config-powerdevil.h.cmake
++++ b/daemon/config-powerdevil.h.cmake
+@@ -1,2 +1,5 @@
+ /* Defines if you have XCB */
+ #cmakedefine HAVE_XCB 1
++
++/* Define to 1 if you have NetworkManagerQt and BluezQt libs. */
++#cmakedefine HAVE_WIRELESS_SUPPORT 1
+diff --git a/daemon/powerdevilactionpool.cpp
b/daemon/powerdevilactionpool.cpp
+index 7ef823a..2864483 100644
+--- a/daemon/powerdevilactionpool.cpp
++++ b/daemon/powerdevilactionpool.cpp
+@@ -24,6 +24,8 @@
+ #include "powerdevilcore.h"
+ #include "powerdevil_debug.h"
+
++#include <config-powerdevil.h>
++
+ #include <KConfigGroup>
+ #include <KServiceTypeTrader>
+ #include <KPluginInfo>
+@@ -38,7 +40,9 @@
+ #include "actions/bundled/dimdisplay.h"
+ #include "actions/bundled/runscript.h"
+ #include "actions/bundled/handlebuttonevents.h"
++#ifdef HAVE_WIRELESS_SUPPORT
+ #include "actions/bundled/wirelesspowersaving.h"
++#endif
+
+ namespace PowerDevil
+ {
+@@ -127,7 +131,9 @@ void ActionPool::init(PowerDevil::Core *parent)
+ m_actionPool.insert("DimDisplay", new
BundledActions::DimDisplay(parent));
+ m_actionPool.insert("RunScript", new BundledActions::RunScript(parent));
+ m_actionPool.insert("HandleButtonEvents", new
BundledActions::HandleButtonEvents(parent));
++#ifdef HAVE_WIRELESS_SUPPORT
+ m_actionPool.insert("WirelessPowerSaving", new
BundledActions::WirelessPowerSaving(parent));
++#endif
+
+ // Verify support
+ QHash<QString,Action*>::iterator i = m_actionPool.begin();
diff --git a/qt5-deprecated/qtwebkit/CONFLICTS
b/qt5-deprecated/qtwebkit/CONFLICTS
index 38420f6..ebf43d2 100755
--- a/qt5-deprecated/qtwebkit/CONFLICTS
+++ b/qt5-deprecated/qtwebkit/CONFLICTS
@@ -1 +1,2 @@
conflicts qtwebkit y
+conflicts webkitqt
diff --git a/qt5-deprecated/qtwebkit/HISTORY b/qt5-deprecated/qtwebkit/HISTORY
index 530e20b..ed8ae50 100644
--- a/qt5-deprecated/qtwebkit/HISTORY
+++ b/qt5-deprecated/qtwebkit/HISTORY
@@ -1,3 +1,7 @@
+2016-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * PROVIDES: added
+ * CONFLICTS: add future webkitqt
+
2016-06-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.7.0

diff --git a/qt5-deprecated/qtwebkit/PROVIDES
b/qt5-deprecated/qtwebkit/PROVIDES
new file mode 100644
index 0000000..9473416
--- /dev/null
+++ b/qt5-deprecated/qtwebkit/PROVIDES
@@ -0,0 +1 @@
+WEBKIT_QT
diff --git a/qt5-qmake/qupzilla/DEPENDS b/qt5-qmake/qupzilla/DEPENDS
new file mode 100755
index 0000000..a3894f2
--- /dev/null
+++ b/qt5-qmake/qupzilla/DEPENDS
@@ -0,0 +1,3 @@
+depends -sub CXX gcc &&
+depends qtbase &&
+depends qtwebengine
diff --git a/qt5-qmake/qupzilla/DETAILS b/qt5-qmake/qupzilla/DETAILS
new file mode 100755
index 0000000..518fcca
--- /dev/null
+++ b/qt5-qmake/qupzilla/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=qupzilla
+ VERSION=2.0.1
+
SOURCE_HASH=sha512:969751821b3760f5b93b1039429cf0f7be599ef24e595751e996c59aa4a52e3ccf837795d64ae36bd3540effe3733105e4513db85c05eef227d1337b1734ced3
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=https://github.com/QupZilla/qupzilla/archive/v${VERSION}.tar.gz
+ WEB_SITE=http://www.qupzilla.com/
+ LICENSE[0]=GPL
+ ENTERED=20140120
+ SHORT="web browser based on WebKit core and Qt Framework"
+cat << EOF
+QupZilla is modern web browser based on WebKit core and Qt Framework.
+EOF
diff --git a/qt5-qmake/qupzilla/HISTORY b/qt5-qmake/qupzilla/HISTORY
new file mode 100644
index 0000000..5d7622a
--- /dev/null
+++ b/qt5-qmake/qupzilla/HISTORY
@@ -0,0 +1,16 @@
+2016-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix, now use qtwebengine, qt5 only
+ * BUILD: delete
+ * DETAILS: version 2.0.1
+
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: depends -sub CXX gcc (half-automated)
+
+2014-02-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD, DEPENDS: add qt5 support
+
+2014-02-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.1
+
+2014-01-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 1.6.0



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d4b54b780a8dd434eaf4c4e046432ea3d07e0432), Treeve Jelbert, 06/22/2016

Archive powered by MHonArc 2.6.24.

Top of Page