update supporting files

CHANGELOG

@@ -1,3 +1,18 @@
+Ver.2.2.0:
+* port to Plasma 5
++ add support of windows list in tooltip
++ add notifications on system events
++ add ability to show selected tag
++ add tags $downN, $upN
++ add new engine netdev
++ add support of smartctl
+- remove ability to hide panel on hotkey
+* small changes in widget logic
+* edit window preview painting
+* KDE4 code upgrade to new ABI
+* dataengine optimization
+* PKGCMD was replaced by ExtUpgrade
+
 Ver.2.1.0:
 + add support of custom scripts
 + add support of desktop preview to DP

CHANGELOG-RU

@@ -1,3 +1,18 @@
+Вер.2.2.0:
+* портирование на Plasma 5
++ добавлена поддержка списка окон в тултипе
++ добавлены уведомления на системные события
++ добавлена возможность показать выбранный тег
++ добавлены теги $downN, $upN
++ добавлен инструмент netdev
++ добавлена поддержка smartctl
+- убрана возможность сокрытия панелей
+* незначительно изменена логика работы виджета
+* исправлена отрисовка превью окон
+* обновление кодовой базы KDE4 под новый ABI
+* оптимизация работы dataengine
+* PKGCMD были заменены на ExtUpgrade
+
 Вер.2.1.0:
 + добавлена функция автообновления
 + добавлена поддерка кастомных скриптов

arch/PKGBUILD-kde4

@@ -2,7 +2,7 @@
 
 pkgname=kdeplasma-applets-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=2.1.0
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('i686' 'x86_64')
@@ -13,14 +13,15 @@ optdepends=("amarok: for music player monitor"
             "clementine: for music player monitor"
             "catalyst: for GPU monitor"
             "hddtemp: for HDD temperature monitor"
+            "smartmontools: for HDD temperature monitor"
             "mpd: for music player monitor"
             "nvidia-utils: for GPU monitor"
             "qmmp: for music player monitor")
 makedepends=('automoc4' 'cmake')
 source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
 install=${pkgname}.install
-md5sums=('37d9ad08b2b4623d2ab9089facf4b5ff')
-backup=('usr/share/config/extsysmon.conf')
+md5sums=('25e1598b2d939b927428a219bae7c187')
+backup=('usr/share/config/plasma-dataengine-extsysmon.conf')
 
 prepare() {
   rm -rf "${srcdir}/build"
@@ -29,7 +30,8 @@ prepare() {
 
 build () {
   cd "${srcdir}/build"
-  cmake -DCMAKE_BUILD_TYPE=Release \
+  cmake -DBUILD_KDE4=ON \
+        -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=$(kde4-config --prefix) \
         "../${_pkgname}"
   make

arch/PKGBUILD-kf5

@@ -1,25 +1,27 @@
 # Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
 
-pkgname=kdeplasma-applets-awesome-widgets
+pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=2.0.5
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('i686' 'x86_64')
 url="http://arcanis.name/projects/awesome-widgets"
 license=('GPL3')
-depends=('kdebase-workspace' 'lm_sensors')
+depends=('lm_sensors' 'plasma-framework')
 optdepends=("amarok: for music player monitor"
             "clementine: for music player monitor"
             "catalyst: for GPU monitor"
             "hddtemp: for HDD temperature monitor"
+            "smartmontools: for HDD temperature monitor"
             "mpd: for music player monitor"
             "nvidia-utils: for GPU monitor"
             "qmmp: for music player monitor")
-makedepends=('automoc4' 'cmake')
-source=(${_pkgname}::git+https://github.com/arcan1s/awesome-widgets/)
-md5sums=('SKIP')
-backup=('usr/share/config/extsysmon.conf')
+makedepends=('cmake' 'extra-cmake-modules')
+source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
+install=${pkgname}.install
+md5sums=('25e1598b2d939b927428a219bae7c187')
+backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
 prepare() {
   rm -rf "${srcdir}/build"
@@ -28,9 +30,10 @@ prepare() {
 
 build () {
   cd "${srcdir}/build"
-  cmake -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=$(kde4-config --prefix) \
-        "../${_pkgname}/sources"
+  cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        "../${_pkgname}"
   make
 }
 

arch/plasma5-applet-awesome-widgets.install

@@ -0,0 +1,11 @@
+post_install() {
+  kbuildsycoca5 > /dev/null 2>&1
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+post_remove() {
+  post_install "$1"
+}

create_archive.sh

@@ -6,8 +6,11 @@ MINOR=$(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $3}'
 PATCH=$(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $3}' | sed 's/.$//g')
 VERSION="${MAJOR}.${MINOR}.${PATCH}"
 
+# update submodules
+git submodule update --init --recursive
+
 # build dataengine
-ARCHIVE="ext-sysmon"
+ARCHIVE="extsysmon"
 # create archive
 [[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f ${ARCHIVE}-${VERSION}-src.tar.xz
 [[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
@@ -18,7 +21,7 @@ rm -rf "${ARCHIVE}"
 # build widget
 ARCHIVE="awesome-widgets"
 FILES="AUTHORS CHANGELOG CHANGELOG-RU COPYING"
-IGNORELIST="build usr"
+IGNORELIST="build usr .kdev4 sources.kdev4"
 # create archive
 [[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"
 [[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
@@ -26,9 +29,13 @@ cp -r "${SRCDIR}" "${ARCHIVE}"
 for FILE in ${FILES[*]}; do cp -r "$FILE" "${ARCHIVE}"; done
 for FILE in ${IGNORELIST[*]}; do rm -rf "${ARCHIVE}/${FILE}"; done
 tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
+ln -sf "../${ARCHIVE}-${VERSION}-src.tar.xz" arch
 rm -rf "${ARCHIVE}"
 
 # update md5sum
 MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
-sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD
-sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD
+sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" arch/PKGBUILD{-kf5,-kde4}
+sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" arch/PKGBUILD{-kf5,-kde4}
+# clear
+find . -type f -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -exec rm -rf {} \;
+find arch -type l -xtype l -exec rm -rf {} \;

sources/CMakeLists.txt

@@ -9,17 +9,9 @@ project (awesomewidgets)
 set (PROJECT_AUTHOR "Evgeniy Alekseev")
 set (PROJECT_CONTACT "esalexeev@gmail.com")
 set (PROJECT_LICENSE "GPLv3")
-
-option (BUILD_KDE4 "Build on KDE4" OFF)
-if (BUILD_KDE4)
-  set (PROJECT_VERSION_MAJOR 2)
-  set (PROJECT_VERSION_MINOR 1)
-  set (PROJECT_VERSION_PATCH 1)
-else ()
-  set (PROJECT_VERSION_MAJOR 2)
-  set (PROJECT_VERSION_MINOR 2)
-  set (PROJECT_VERSION_PATCH 0)
-endif ()
+set (PROJECT_VERSION_MAJOR 2)
+set (PROJECT_VERSION_MINOR 2)
+set (PROJECT_VERSION_PATCH 0)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 
 string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
@@ -29,6 +21,8 @@ message (STATUS "Project: ${PROJECT_NAME}")
 message (STATUS "Version: ${PROJECT_VERSION}")
 message (STATUS "Build date: ${CURRENT_DATE}")
 
+option (BUILD_KDE4 "Build on KDE4" OFF)
+
 # flags
 if (CMAKE_COMPILER_IS_GNUCXX)
   set (CMAKE_CXX_FLAGS "-Wall -Wno-cpp -std=c++11")