Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (607e61020b11a73867f4d8ce289caf7509d42735)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (607e61020b11a73867f4d8ce289caf7509d42735)
  • Date: Sat, 10 Sep 2016 23:45:27 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

audio-players/mpc/DETAILS | 4
audio-players/mpc/HISTORY | 3
audio-players/ncmpcpp/DETAILS | 4
audio-players/ncmpcpp/HISTORY | 3
dev/null |binary
devel/cppcheck/DETAILS | 4
devel/cppcheck/HISTORY | 3
devel/diffutils/DETAILS | 2
devel/diffutils/HISTORY | 3
fonts-x11/ttf-roboto/DETAILS | 10
fonts-x11/ttf-roboto/HISTORY | 4
fonts-x11/ttf-roboto/INSTALL | 4
fonts-x11/ttf-roboto/PRE_BUILD | 3
graphics-libs/poppler/DETAILS | 8
graphics-libs/poppler/HISTORY | 3
libs/libevdev/DETAILS | 4
libs/libevdev/HISTORY | 3
libs/libfm/DETAILS | 4
libs/libfm/HISTORY | 3
libs/libyaml/DETAILS | 4
libs/libyaml/HISTORY | 3
libs/ncurses/HISTORY | 3
libs/ncurses/INSTALL | 4
lxde/menu-cache/0001-fix-path-to-header.patch | 25 ++
lxde/menu-cache/DETAILS | 8
lxde/menu-cache/HISTORY | 4
lxde/menu-cache/PRE_BUILD | 4
shell-term-fm/pcmanfm/DETAILS | 4
shell-term-fm/pcmanfm/HISTORY | 6
shell-term-fm/shared-mime-info/DETAILS | 4
shell-term-fm/shared-mime-info/HISTORY | 3
utils/dialog/DETAILS | 2
utils/dialog/HISTORY | 3
utils/ncdu/DETAILS | 4
utils/ncdu/HISTORY | 3
video-libs/frei0r-plugins/BUILD | 1
video-libs/frei0r-plugins/DEPENDS | 6
video-libs/frei0r-plugins/DETAILS | 8
video-libs/frei0r-plugins/HISTORY | 3
x11/conky/BUILD | 2
x11/conky/CONFIGURE | 24 +-
x11/conky/DEPENDS | 106
++++++----
x11/conky/DETAILS | 10
x11/conky/HISTORY | 12 +
x11/conky/PRE_BUILD | 8
x11/conky/conky-1.10.4-x11-build.patch | 31 ++
x11/conky/conky-1.8.1-utf8-scroll.patch | 104
---------
x11/conky/conky-1.9.0-apcupsd.patch | 106
----------
x11/conky/conky-1.9.0-default-graph-size.patch | 18 -
x11/conky/conky-1.9.0-diskio-dmmajor.patch | 25 --
x11/conky/conky-1.9.0-lines-fix.patch | 36 ---
x11/conky/conky-1.9.0-ncurses.patch | 31 --
x11/conky/conky-1.9.0-update-when-message-count-decreases.patch | 75
-------
53 files changed, 266 insertions(+), 496 deletions(-)

New commits:
commit 607e61020b11a73867f4d8ce289caf7509d42735
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libyaml: version 0.1.7

commit 20da406361590499a028310d89c51692db745924
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libevdev: version 1.5.4

commit aaa1033e1da775ff918404c9304004027b107a8d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/dialog: version 1.3-20160828

commit 3f962972f8522b56c6be5dd7448b200f1aba6bbd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/shared-mime-info: version 1.7

commit 045ae90d909b3431f2e2608b0e74ceee1b2c32c0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/cppcheck: version 1.75

commit 9d3ae857a61579732f16a9e953e80df2ebad7bdb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

fonts-x11/ttf-roboto: version 2.134

commit 3e8532bf40eb2da12e83f5deea1e518a9dc9731e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video-libs/frei0r-plugins: version 1.5.0

commit a2e4880d693acece76a2e50be14674e78810f769
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/poppler: version 0.47.0

commit 655a97cd6c76a0d7c12df8a3d9f18dbc80caca2a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/conky: version 1.10.4

commit bed35c84674d3ed328dd3eed69d93e2b37164a47
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/ncurses: create symlinks for .pc files

commit 325594cdee2f8f6b5da2671f8bb804dd1dc0f211
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/diffutils: version 3.5

commit a94b9935158231a2cd406d4a29e9fd87c3b73efc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/ncdu: version 1.12

commit 6689975ff17ef9e7518b33be53d787784b434d64
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-players/ncmpcpp: version 0.7.5

commit 0251e84af4adeebbf4feb7f8f362119065579f47
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-players/mpc: version 0.28

commit ec617b4017692bd4a56a94447a1529e900e40958
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/pcmanfm: version 1.2.4

commit 8dcdcda2743d5baee9f42ccf9a9d2fcd32fb4dd4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

lxde/menu-cache: version 1.0.1

commit 4687cfa3ce6a65e404d3ec8f2c2fe2e143cecbbd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libfm: version 1.2.4

diff --git a/audio-players/mpc/DETAILS b/audio-players/mpc/DETAILS
index 294a61d..fbd8844 100755
--- a/audio-players/mpc/DETAILS
+++ b/audio-players/mpc/DETAILS
@@ -1,10 +1,10 @@
SPELL=mpc
- VERSION=0.27
+ VERSION=0.28
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.musicpd.org/download/mpc/0/${SOURCE}
WEB_SITE=http://www.musicpd.org
-
SOURCE_HASH=sha512:f73550004697c6d4ae44f25c82a9e4477fa878accb8725f58b74b2785c02b175a35e675c5484c58766e9032fe19beabd35a64c57cd1afd81478619d2f51916d4
+
SOURCE_HASH=sha512:1d0c96c3c7cee2eac2d3cf25f09d74b5807b8ea56ff7dfc033b8fa690fd4d42de726a641e4f2552550d8a1c1b2840575aec5c595166ca5ae5776fcc93c8fb7cf
LICENSE[0]=GPL
ENTERED=20040516
DOCS="AUTHORS COPYING ChangeLog README"
diff --git a/audio-players/mpc/HISTORY b/audio-players/mpc/HISTORY
index 9516d07..91f19cd 100644
--- a/audio-players/mpc/HISTORY
+++ b/audio-players/mpc/HISTORY
@@ -1,3 +1,6 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.28
+
2016-03-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: remove trailing garbage

diff --git a/audio-players/ncmpcpp/DETAILS b/audio-players/ncmpcpp/DETAILS
index 05d0f8f..a930c6f 100755
--- a/audio-players/ncmpcpp/DETAILS
+++ b/audio-players/ncmpcpp/DETAILS
@@ -1,8 +1,8 @@
SPELL=ncmpcpp
- VERSION=0.7.3
+ VERSION=0.7.5
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://ncmpcpp.rybczak.net/stable/${SOURCE}
-
SOURCE_HASH=sha512:6314b97f36014ade92b3a73640bf529625d75d20a68fb9b2999de579095e37c46e1951b22b0a849bd8e23998e72cfa77f717cff914b7e20dccc0a918cb739732
+
SOURCE_HASH=sha512:5f3b370a5a8fdc05e85a7b748debd960c0e76d5b9e43717efceaa985baa0c543d14d8b0fd7b09550111bff3aa66ec290d6cd2c0ec21de7a0caa10df1c68c99c8
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://ncmpcpp.rybczak.net/
LICENSE[0]=GPL
diff --git a/audio-players/ncmpcpp/HISTORY b/audio-players/ncmpcpp/HISTORY
index ce4b141..23dfb89 100644
--- a/audio-players/ncmpcpp/HISTORY
+++ b/audio-players/ncmpcpp/HISTORY
@@ -1,3 +1,6 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.7.5
+
2016-03-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.7.3

diff --git a/devel/cppcheck/DETAILS b/devel/cppcheck/DETAILS
index a68e00b..32f004f 100755
--- a/devel/cppcheck/DETAILS
+++ b/devel/cppcheck/DETAILS
@@ -1,8 +1,8 @@
SPELL=cppcheck
- VERSION=1.73
+ VERSION=1.75
SOURCE="${SPELL}-${VERSION}.tar.bz2"

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:a703cb47016982c27509bd46fa601b5baf359b0c44be188e2f5fe7d64b2accc392af5aa803a5e298b778f15b979585781ecd1459c8d2dd8b033f34cb1bad15a7
+
SOURCE_HASH=sha512:74116a7a2cd1c8c9a06c81f3f4de3de281f24ee30692729de5506dc7572ed694e55c32d1ad72196a9b95005e9f8d749bd82655323f8ff56051997c2ffc4ed57f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"

WEB_SITE="http://sourceforge.net/apps/mediawiki/cppcheck/index.php?title=Main_Page";
LICENSE[0]=GPL
diff --git a/devel/cppcheck/HISTORY b/devel/cppcheck/HISTORY
index e0eeeaf..da57a16 100644
--- a/devel/cppcheck/HISTORY
+++ b/devel/cppcheck/HISTORY
@@ -1,3 +1,6 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.75
+
2016-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, BUILD: version 1.73

diff --git a/devel/diffutils/DETAILS b/devel/diffutils/DETAILS
index 7a7ed62..1b0cdad 100755
--- a/devel/diffutils/DETAILS
+++ b/devel/diffutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=diffutils
- VERSION=3.4
+ VERSION=3.5
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/diffutils/HISTORY b/devel/diffutils/HISTORY
index 269b5fd..fc02b06 100644
--- a/devel/diffutils/HISTORY
+++ b/devel/diffutils/HISTORY
@@ -1,3 +1,6 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.5
+
2016-08-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 3.4

diff --git a/fonts-x11/ttf-roboto/DETAILS b/fonts-x11/ttf-roboto/DETAILS
index 811d0dd..b813705 100755
--- a/fonts-x11/ttf-roboto/DETAILS
+++ b/fonts-x11/ttf-roboto/DETAILS
@@ -1,9 +1,9 @@
SPELL=ttf-roboto
- VERSION=20120823
- SOURCE="Roboto_Hinted_${VERSION}.zip"
-
SOURCE_URL[0]=http://commondatastorage.googleapis.com/androiddevelopers/design/${SOURCE}
-
SOURCE_HASH=sha512:ce4af34d0a23dd4076d033dcb03f17335eb83317da72b45257291be3aa34ff589405bfdfb768faca769d401a9091b63e5f195704ed69874d7d17289ca436a785
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ VERSION=2.134
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://github.com/google/roboto/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:dd9da914126096407ea9441406f99a9e0ef6808aca5c5c9d2ba8aa43d6680ab5a9c45891d0bcea25a95989e30156513d1d8e7bb480459f5c43f74e153a39262f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/roboto-${VERSION}"
WEB_SITE="http://developer.android.com/design/style/typography.html";
LICENSE[0]=apache
ENTERED=20130208
diff --git a/fonts-x11/ttf-roboto/HISTORY b/fonts-x11/ttf-roboto/HISTORY
index 3313716..fcb1ac1 100644
--- a/fonts-x11/ttf-roboto/HISTORY
+++ b/fonts-x11/ttf-roboto/HISTORY
@@ -1,3 +1,7 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, INSTALL: version 2.134
+ * PRE_BUILD: removed
+
2014-10-30 Ismael Luceno <ismael AT sourcemage.org>
* HISTORY: Install to /usr/share/fonts/TTF

diff --git a/fonts-x11/ttf-roboto/INSTALL b/fonts-x11/ttf-roboto/INSTALL
index 68f210d..2509783 100755
--- a/fonts-x11/ttf-roboto/INSTALL
+++ b/fonts-x11/ttf-roboto/INSTALL
@@ -1,3 +1 @@
-install -m644 $SOURCE_DIRECTORY/*.ttf $INSTALL_ROOT/usr/share/fonts/TTF/ &&
-mkdir -p $INSTALL_ROOT/usr/share/doc/ttf-roboto/ &&
-install -m644 $SOURCE_DIRECTORY/{COPYING.txt,RobotoSpecimenBook.pdf}
$INSTALL_ROOT/usr/share/doc/ttf-roboto/
+install -m644 $SOURCE_DIRECTORY/hinted/*.ttf
$INSTALL_ROOT/usr/share/fonts/TTF/
diff --git a/fonts-x11/ttf-roboto/PRE_BUILD b/fonts-x11/ttf-roboto/PRE_BUILD
deleted file mode 100755
index cdbb324..0000000
--- a/fonts-x11/ttf-roboto/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-unpack_file ''
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 91d32da..4770750 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -9,11 +9,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.42.0
-
SOURCE_HASH=sha512:ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19
+ VERSION=0.47.0
+
SOURCE_HASH=sha512:44b5b1546f66f1b95e1359f4fdf79458d902604dababbcc0ecb0d45ed90451680bb1f3b5e163bd17e16fda1b8656bec6c9072964f9d8f276cb38a7be95db63a5
else
- VERSION=0.42.0
-
SOURCE_HASH=sha512:ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19
+ VERSION=0.47.0
+
SOURCE_HASH=sha512:44b5b1546f66f1b95e1359f4fdf79458d902604dababbcc0ecb0d45ed90451680bb1f3b5e163bd17e16fda1b8656bec6c9072964f9d8f276cb38a7be95db63a5
fi
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index b10288d..0ba82ec 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.47.0
+
2016-04-17 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: made openjpeg optional

diff --git a/libs/libevdev/DETAILS b/libs/libevdev/DETAILS
index 5c5dc72..7a8b448 100755
--- a/libs/libevdev/DETAILS
+++ b/libs/libevdev/DETAILS
@@ -1,6 +1,6 @@
SPELL=libevdev
- VERSION=1.4.6
-
SOURCE_HASH=sha512:7c2250ed87a352e5ce8503ff4ea7cac29e45bdfbde6e3443dd091ebfe139cb7a2b4be5e16d1aa1bf7e0e0550c16eb1d0038992645bf0bef5528f2dca4a8f0290
+ VERSION=1.5.4
+
SOURCE_HASH=sha512:9062b8c599ccc361d39bd0d06ee7dd7ddcca21541849a5f53ff1ec6d9760a8b575d90201a9a6b5ac5a01e7a77af9d191901bb1196976de52080e351717119f4e
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.freedesktop.org/wiki/Software/libevdev/
diff --git a/libs/libevdev/HISTORY b/libs/libevdev/HISTORY
index d00c46d..6caa131 100644
--- a/libs/libevdev/HISTORY
+++ b/libs/libevdev/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.5.4
+
2016-01-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.4.6

diff --git a/libs/libfm/DETAILS b/libs/libfm/DETAILS
index e9bbf8f..50e58e4 100755
--- a/libs/libfm/DETAILS
+++ b/libs/libfm/DETAILS
@@ -1,8 +1,8 @@
SPELL=libfm
- VERSION=1.2.3
+ VERSION=1.2.4
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/project/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/${SOURCE}
-
SOURCE_HASH=sha512:f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443
+
SOURCE_HASH=sha512:c609e822959f9fa83eaee6552906b6fd22d210f0802944816230b1932fc06632dc557b8998d2d065100212f79dffe13257587c744aba78592983681c8410dc24
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOC_DIRS=""
WEB_SITE=http://wiki.lxde.org/en/PCManFM
diff --git a/libs/libfm/HISTORY b/libs/libfm/HISTORY
index cc2aa77..1d79641 100644
--- a/libs/libfm/HISTORY
+++ b/libs/libfm/HISTORY
@@ -1,3 +1,6 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.2.4
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/libs/libyaml/DETAILS b/libs/libyaml/DETAILS
index 1b77ec8..13a4e19 100755
--- a/libs/libyaml/DETAILS
+++ b/libs/libyaml/DETAILS
@@ -1,6 +1,6 @@
SPELL=libyaml
- VERSION=0.1.6
-
SOURCE_HASH=sha512:eef1f26fec0a305836b8c6a65def4e2864fe2415618e7490717d4e42f0fc51048727ab0e7e4a6c3a2783ae762fddd6b78091a76a6cd3a2710ae18e3dfb27cd44
+ VERSION=0.1.7
+
SOURCE_HASH=sha512:1ee5007dd10db137b5ee80f8117f07390ec04af98d087a5f5475dd2b38d87c699b79ab1676e6c7bfa263323fcdf8edd69fada2b0b7f9c57bef4e46cd65f1e975
SOURCE=yaml-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/yaml-$VERSION
SOURCE_URL[0]=http://pyyaml.org/download/libyaml/$SOURCE
diff --git a/libs/libyaml/HISTORY b/libs/libyaml/HISTORY
index 753296f..8ce69f5 100644
--- a/libs/libyaml/HISTORY
+++ b/libs/libyaml/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.1.7
+
2014-05-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.6

diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 2ed4e4a..e06dd73 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,6 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: create symlinks for .pc files
+
2015-04-25 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, ncurses-5.9-gcc5_buildfixes-1.patch: added a patch
from LFS project to fix building with gcc 5.1
diff --git a/libs/ncurses/INSTALL b/libs/ncurses/INSTALL
index 231bb29..bb4f22e 100755
--- a/libs/ncurses/INSTALL
+++ b/libs/ncurses/INSTALL
@@ -104,4 +104,8 @@ fi &&

ln -sf libcurses.so.${MVERSION} ${INSTALL_ROOT}/lib/libtinfo.so.${MVERSION}
&&

+for i in form menu ncurses++ ncurses panel; do
+ ln -sf /usr/lib/pkgconfig/${i}w.pc /usr/lib/pkgconfig/${i}.pc
+done &&
+
ldconfig
diff --git a/lxde/menu-cache/0001-fix-path-to-header.patch
b/lxde/menu-cache/0001-fix-path-to-header.patch
new file mode 100644
index 0000000..42906cf
--- /dev/null
+++ b/lxde/menu-cache/0001-fix-path-to-header.patch
@@ -0,0 +1,25 @@
+From 6e58c2c34383ac24ab4ff2f0aa6c70f18091a359 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Sat, 10 Sep 2016 13:03:44 +0200
+Subject: [PATCH] fix path to header
+
+---
+ menu-cache-gen/menu-tags.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
+index f3fd7d3..e9ee422 100644
+--- a/menu-cache-gen/menu-tags.h
++++ b/menu-cache-gen/menu-tags.h
+@@ -19,7 +19,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
+ */
+
+-#include <libfm/fm-extra.h>
++#include <libfm-1.0/fm-extra.h>
+ #include <menu-cache.h>
+
+ FmXmlFileTag menuTag_Menu;
+--
+2.10.0
+
diff --git a/lxde/menu-cache/DETAILS b/lxde/menu-cache/DETAILS
index d72a39f..24f31e3 100755
--- a/lxde/menu-cache/DETAILS
+++ b/lxde/menu-cache/DETAILS
@@ -1,8 +1,8 @@
SPELL=menu-cache
- VERSION=0.5.1
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/lxde/menu-cache/menu-cache%20${VERSION%.*}.x/${SOURCE}
-
SOURCE_HASH=sha512:44d55a01f5452804e77518c4a2ba400a5b65edbf4061e346a6c02356195867eaa0bb9eaa057fbf603ddf79759acb16632bf3b7ae543eebc1544e28517cd23066
+ VERSION=1.0.1
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/lxde/${SPELL}/$(echo
$VERSION | cut -f1,2 -d.)/${SOURCE}
+
SOURCE_HASH=sha512:5de4bf99ab5a511da6781d54b03349cc0232b379a73f9f9c328fb9aed6ec03558a9adda85be1fbbe53d94669d07a5196929ab67cd3291de7aae59f587afda3a3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://lxde.sourceforge.net/
LICENSE[0]=GPL
diff --git a/lxde/menu-cache/HISTORY b/lxde/menu-cache/HISTORY
index 8166904..8258f4d 100644
--- a/lxde/menu-cache/HISTORY
+++ b/lxde/menu-cache/HISTORY
@@ -1,3 +1,7 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.1
+ * PRE_BUILD, 0001-fix-path-to-header.patch: fix compile error
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/lxde/menu-cache/PRE_BUILD b/lxde/menu-cache/PRE_BUILD
new file mode 100755
index 0000000..321a477
--- /dev/null
+++ b/lxde/menu-cache/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-path-to-header.patch"
diff --git a/shell-term-fm/pcmanfm/DETAILS b/shell-term-fm/pcmanfm/DETAILS
index 5f6804b..6802af6 100755
--- a/shell-term-fm/pcmanfm/DETAILS
+++ b/shell-term-fm/pcmanfm/DETAILS
@@ -1,8 +1,8 @@
SPELL=pcmanfm
- VERSION=1.2.3
+ VERSION=1.2.4
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/${SOURCE}
-
SOURCE_HASH=sha512:b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28
+
SOURCE_HASH=sha512:f4d0ed9d5dcc1b01643715fd54b94ff46967801f0c6d1dde6d196fadbedb5551cfda536d548237b187e5545cceea0a987f7c1c8e38659cae109b6483f14798f7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://wiki.lxde.org/en/PCManFM
LICENSE[0]=GPL
diff --git a/shell-term-fm/pcmanfm/HISTORY b/shell-term-fm/pcmanfm/HISTORY
index b1317aa..364d5e5 100644
--- a/shell-term-fm/pcmanfm/HISTORY
+++ b/shell-term-fm/pcmanfm/HISTORY
@@ -1,3 +1,9 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.2.4
+
+2015-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_HASH
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/shell-term-fm/shared-mime-info/DETAILS
b/shell-term-fm/shared-mime-info/DETAILS
index 7ce4212..ff6b223 100755
--- a/shell-term-fm/shared-mime-info/DETAILS
+++ b/shell-term-fm/shared-mime-info/DETAILS
@@ -1,6 +1,6 @@
SPELL=shared-mime-info
- VERSION=1.6
-
SOURCE_HASH=sha512:01c57759d363a2f0513cda94de5eb236f3d56683630a1be12278d9043d6184cf5f04a25b9cdca76b72fe42590542dfd41ae39f4e9bcd9cb239c200e9079a5840
+ VERSION=1.7
+
SOURCE_HASH=sha512:008745fe23cf751d2fd7f701ffdaaf22eff2c2e37b77455b94c26c718839f681654577035330f740429c862b8060939f9932f313b452ac885bf811dacce3eb78
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://freedesktop.org/~hadess/$SOURCE
diff --git a/shell-term-fm/shared-mime-info/HISTORY
b/shell-term-fm/shared-mime-info/HISTORY
index 2694fdf2..9eaecd4 100644
--- a/shell-term-fm/shared-mime-info/HISTORY
+++ b/shell-term-fm/shared-mime-info/HISTORY
@@ -1,3 +1,6 @@
+2016-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7
+
2016-02-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.6

diff --git a/utils/dialog/DETAILS b/utils/dialog/DETAILS
index ff953db..a7ee1e9 100755
--- a/utils/dialog/DETAILS
+++ b/utils/dialog/DETAILS
@@ -1,5 +1,5 @@
SPELL=dialog
- VERSION=1.2-20150125
+ VERSION=1.3-20160828
SOURCE=$SPELL-$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/dialog/HISTORY b/utils/dialog/HISTORY
index f522d56..48279b7 100644
--- a/utils/dialog/HISTORY
+++ b/utils/dialog/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3-20160828
+
2015-02-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2-20150125

diff --git a/utils/ncdu/DETAILS b/utils/ncdu/DETAILS
index 833096f..95aa45a 100755
--- a/utils/ncdu/DETAILS
+++ b/utils/ncdu/DETAILS
@@ -1,9 +1,9 @@
SPELL="ncdu"
- VERSION=1.11
+ VERSION=1.12
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
SOURCE_URL[0]="http://dev.yorhel.nl/download/${SOURCE}";
-
SOURCE_HASH=sha512:4b9319900dd11da7c3bd2ba9a478c52b8280e3560b8b5b6610fc145c5d81d726715db69cd21bd400d75339a5bcf140bcafb3b4430075427a51b65763e81d8c48
+
SOURCE_HASH=sha512:20620dd79d2af878442769e097f13806f64f23875dcb85ebccd573a3de43aba5663d496049b64015d13f9a79d624298032c008ef61dfb6f61d8b12902b8dca12
WEB_SITE="http://dev.yorhel.nl/ncdu/";
LICENSE[0]="MIT"
ENTERED="20081119"
diff --git a/utils/ncdu/HISTORY b/utils/ncdu/HISTORY
index 686cfaa..118ca55 100644
--- a/utils/ncdu/HISTORY
+++ b/utils/ncdu/HISTORY
@@ -1,3 +1,6 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.12
+
2015-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.11

diff --git a/video-libs/frei0r-plugins/BUILD b/video-libs/frei0r-plugins/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/video-libs/frei0r-plugins/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/video-libs/frei0r-plugins/DEPENDS
b/video-libs/frei0r-plugins/DEPENDS
index 9dd3ace..4367212 100755
--- a/video-libs/frei0r-plugins/DEPENDS
+++ b/video-libs/frei0r-plugins/DEPENDS
@@ -1,3 +1,5 @@
-optional_depends gavl "" "" "Required for scale0tilt and vectorscope
filters?" &&
-optional_depends opencv "" "" "Required for facebl0r filter?"
+depends cmake &&
+
+optional_depends gavl "-DWITHOUT_GAVL=off" "-DWITHOUT_GAVL=on" "Required for
scale0tilt and vectorscope filters?" &&
+optional_depends opencv "-DWITHOUT_OPENCV=off" "-DWITHOUT_OPENCV=on"
"Required for facebl0r filter?"

diff --git a/video-libs/frei0r-plugins/DETAILS
b/video-libs/frei0r-plugins/DETAILS
index 1bc1808..f573670 100755
--- a/video-libs/frei0r-plugins/DETAILS
+++ b/video-libs/frei0r-plugins/DETAILS
@@ -1,9 +1,9 @@
SPELL=frei0r-plugins
- VERSION=1.3
+ VERSION=1.5.0
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/frei0r-$VERSION
- SOURCE_URL[0]=ftp://ftp.dyne.org/frei0r/releases/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=https://files.dyne.org/frei0r/${SOURCE}
+
SOURCE_HASH=sha512:9be0384421ff5ac9000dcda9acefb5cb2b6dc05ea72d9771fae990cb5fad4424dcef8dd15c1e5031a89169f914af8c7a30e47934ad007a3bc0150f3c005bc6bf
LICENSE[0]=GPL
WEB_SITE=http://frei0r.dyne.org/
ENTERED=20101210
diff --git a/video-libs/frei0r-plugins/HISTORY
b/video-libs/frei0r-plugins/HISTORY
index c710675..e936c61 100644
--- a/video-libs/frei0r-plugins/HISTORY
+++ b/video-libs/frei0r-plugins/HISTORY
@@ -1,3 +1,6 @@
+2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD, DEPENDS: version 1.5.0, use cmake as build system
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/video-libs/frei0r-plugins/frei0r-plugins-1.3.tar.gz.sig
b/video-libs/frei0r-plugins/frei0r-plugins-1.3.tar.gz.sig
deleted file mode 100644
index a1407ba..0000000
Binary files a/video-libs/frei0r-plugins/frei0r-plugins-1.3.tar.gz.sig and
/dev/null differ
diff --git a/x11/conky/BUILD b/x11/conky/BUILD
index 2e70ddf..4712181 100755
--- a/x11/conky/BUILD
+++ b/x11/conky/BUILD
@@ -1,2 +1,2 @@
OPTS="$OPTS $CONKY_OPTS" &&
-default_build
+cmake_build
diff --git a/x11/conky/CONFIGURE b/x11/conky/CONFIGURE
index 49228a9..aecb49c 100755
--- a/x11/conky/CONFIGURE
+++ b/x11/conky/CONFIGURE
@@ -1,16 +1,24 @@
+config_query_option CONKY_OPTS 'enable real transparency support?' n \
+ '-DBUILD_ARGB=on' '-DBUILD_ARGB=off' &&
config_query_option CONKY_OPTS 'enable METAR weather support?' n \
- '--enable-weather-metar' '--disable-weather-metar' &&
+ '-DBUILD_WEATHER_METAR=on' '-DBUILD_WEATHER_METAR=off' &&
config_query_option CONKY_OPTS 'enable XOAP weather support?' n \
- '--enable-weather-xoap' '--disable-weather-xoap' &&
+ '-DBUILD_WEATHER_XOAP=on' '-DBUILD_WEATHER_XOAP=off' &&
+config_query_option CONKY_OPTS 'enable support HTTP?' n \
+ '-DBUILD_HTTP=on' '-DBUILD_HTTP=off' &&
config_query_option CONKY_OPTS 'enable support for IBM/Lenovo laptops?' n \
- '--enable-ibm' '--disable-ibm' &&
+ '-DBUILD_IBM=on' '-DBUILD_IBM=off' &&
+config_query_option CONKY_OPTS 'enable support for iconv?' n \
+ '-DBUILD_ICONV=on' '-DBUILD_ICONV=off' &&
config_query_option CONKY_OPTS 'enable support for Eve-Online skill
monitor?' n \
- '--enable-eve' '--disable-eve' &&
+ '-DBUILD_EVE=on' '-DBUILD_EVE=off' &&
config_query_option CONKY_OPTS 'enable support for RSS?' n \
- '--enable-rss' '--disable-rss' &&
+ '-DBUILD_RSS=on' '-DBUILD_RSS=off' &&
config_query_option CONKY_OPTS 'enable support for hard disk temperature?' y
\
- '--enable-hddtemp' '--disable-hddtemp' &&
+ '-DBUILD_HDDTEMP=on' '-DBUILD_HDDTEMP=off' &&
config_query_option CONKY_OPTS 'enable support for per task IO stats?' y \
- '--enable-iostats' '--disable-iostats' &&
+ '-DBUILD_IOSTATS=on' '-DBUILD_IOSTATS=off' &&
+config_query_option CONKY_OPTS 'enable support XShape?' y \
+ '-DBUILD_XSHAPE=on' '-DBUILD_XSHAPE=off' &&
config_query_option CONKY_OPTS 'enable support for IPv4 port monitoring?' y \
- '--enable-portmon' '--disable-portmon'
+ '-DBUILD_PORT_MONITORS=on' '-DBUILD_PORT_MONITORS=off'
diff --git a/x11/conky/DEPENDS b/x11/conky/DEPENDS
index f6fa69c..b0284bb 100755
--- a/x11/conky/DEPENDS
+++ b/x11/conky/DEPENDS
@@ -1,79 +1,115 @@
depends glib2 &&
+depends cmake &&

optional_depends libx11 \
- "--enable-x11" \
- "--disable-x11" \
+ "-DBUILD_X11=on" \
+ "-DBUILD_X11=off" \
"for X11 support" &&

if is_depends_enabled $SPELL libx11; then
optional_depends libxdamage \
- "--enable-xdamage" \
- "--disable-xdamage" \
+ "-DBUILD_XDAMAGE=on" \
+ "-DBUILD_XDAMAGE=off" \
"for Xdamage support" &&

optional_depends libxext \
- "--enable-double-buffer" \
- "--disable-double-buffer" \
+ "-DBUILD_XDBE=on" \
+ "-DBUILD_XDBE=off" \
"for Xdbe double-buffering support" &&

optional_depends libxft \
- "--enable-xft" \
- "--disable-xft" \
+ "-DBUILD_XFT=on" \
+ "-DBUILD_XFT=off" \
+ "for Xft support" &&
+
+ optional_depends libxinerama \
+ "-DBUILD_XINERAMA=on" \
+ "-DBUILD_XINERAMA=off" \
"for Xft support"
fi &&

+optional_depends cmus \
+ "-DBUILD_CMUS=on" \
+ "-DBUILD_CMUS=off" \
+ "for cmus music player support" &&
+
optional_depends curl \
- "--enable-curl" \
- "--disable-curl" \
+ "-DBUILD_CURL=on" \
+ "-DBUILD_CURL=off" \
"for curl support" &&

optional_depends mpd \
- "--enable-mpd" \
- "--disable-mpd" \
+ "-DBUILD_MPD=on" \
+ "-DBUILD_MPD=off" \
"for Music Player Daemon support" &&

optional_depends xmms2 \
- "--enable-xmms2" \
- "--disable-xmms2" \
+ "-DBUILD_XMMS2=on" \
+ "-DBUILD_XMMS2=off" \
"for XMMS2 support" &&

optional_depends bmpx \
- "--enable-bmpx" \
- "--disable-bmpx" \
+ "-DBUILD_BMPX=on" \
+ "-DBUILD_BMPX=off" \
"for BMPx support" &&

optional_depends audacious \
- "--enable-audacious" \
- "--disable-audacious" \
+ "-DBUILD_AUDACIOUS=on" \
+ "-DBUILD_AUDACIOUS=off" \
"for Audacious support" &&

+optional_depends libical \
+ "-DBUILD_ICAL=on" \
+ "-DBUILD_ICAL=off" \
+ "for ical support" &&
+
+optional_depends libircclient \
+ "-DBUILD_IRC=on" \
+ "-DBUILD_IRC=off" \
+ "for IRC support" &&
+
optional_depends imlib2 \
- "--enable-imlib2" \
- "--disable-imlib2" \
+ "-DBUILD_IMLIB2=on" \
+ "-DBUILD_IMLIB2=off" \
"for Imlib2 support" &&

-optional_depends alsa-lib \
- "--enable-alsa" \
- "--disable-alsa" \
- "for ALSA support" &&
+#optional_depends alsa-lib \
+# "-DBUILD_ALSA=on" \
+# "-DBUILD_ALSA=off" \
+# "for ALSA support" &&

-optional_depends lua51 \
- "--enable-lua" \
- "--disable-lua" \
- "for Lua scripting support" &&
+#optional_depends lua51 \
+# "--enable-lua" \
+# "--disable-lua" \
+# "for Lua scripting support" &&

optional_depends wireless_tools \
- "--enable-wlan" \
- "--disable-wlan" \
+ "-DBUILD_WLAN=on" \
+ "-DBUILD_WLAN=off" \
"for Wireless support" &&

+optional_depends systemd \
+ "-DBUILD_JOURNAL=on" \
+ "-DBUILD_JOURNAL=off" \
+ "for support for reading from systemd journal" &&
+
optional_depends ncurses \
- "--enable-ncurses" \
- "--disable-ncurses" \
+ "-DBUILD_NCURSES=on" \
+ "-DBUILD_NCURSES=off" \
"for TUI support" &&

+optional_depends mysql \
+ "-DBUILD_MYSQL=on" \
+ "-DBUILD_MYSQL=off" \
+ "for mysql support" &&
+
optional_depends moc \
- "--enable-moc" \
- "--disable-moc" \
- "for moc player support"
+ "-DBUILD_MOC=on" \
+ "-DBUILD_MOC=off" \
+ "for moc player support" &&
+
+optional_depends pulseaudio \
+ "-DBUILD_PULSEAUDIO=on" \
+ "-DBUILD_PULSEAUDIO=off" \
+ "for pulseaudio support"

diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index 1278e54..28bdc52 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -1,12 +1,12 @@
SPELL=conky
- VERSION=1.9.0
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.10.4
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SPELL/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889
+
SOURCE_URL[0]=https://github.com/brndnmtthws/conky/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
LICENSE[0]=BSD
LICENSE[1]=GPL
- WEB_SITE=http://conky.sourceforge.net/
+ WEB_SITE=https://github.com/brndnmtthws/conky
ENTERED=20051018
SHORT="advanced, highly configurable system monitor for X"
cat << EOF
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index f9fe498..5df37a7 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,15 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, DEPENDS, CONFIGURE: version 1.10.4
+ * conky-1.8.1-utf8-scroll.patch,
+ conky-1.9.0-apcupsd.patch,
+ conky-1.9.0-default-graph-size.patch,
+ conky-1.9.0-diskio-dmmajor.patch,
+ conky-1.9.0-lines-fix.patch,
+ conky-1.9.0-ncurses.patch,
+ conky-1.9.0-update-when-message-count-decreases.patch,
+ PRE_BUILD: remove obsolete patches
+ * conky-1.10.4-x11-build.patch, PRE_BUILD: fix build against x11
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/x11/conky/PRE_BUILD b/x11/conky/PRE_BUILD
index 5398005..2588747 100755
--- a/x11/conky/PRE_BUILD
+++ b/x11/conky/PRE_BUILD
@@ -1,10 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-patch -p1 < ${SPELL_DIRECTORY}/conky-1.8.1-utf8-scroll.patch &&
-patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-ncurses.patch &&
-patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-lines-fix.patch &&
-patch -p1 <
${SPELL_DIRECTORY}/conky-1.9.0-update-when-message-count-decreases.patch &&
-patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-apcupsd.patch &&
-patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-default-graph-size.patch &&
-patch -p1 < ${SPELL_DIRECTORY}/conky-1.9.0-diskio-dmmajor.patch
+patch -p1 < "$SPELL_DIRECTORY/conky-1.10.4-x11-build.patch"
diff --git a/x11/conky/conky-1.10.4-x11-build.patch
b/x11/conky/conky-1.10.4-x11-build.patch
new file mode 100644
index 0000000..eb113a4
--- /dev/null
+++ b/x11/conky/conky-1.10.4-x11-build.patch
@@ -0,0 +1,31 @@
+From 178015a9495b7d40031ed7459e4f6b6731633a7c Mon Sep 17 00:00:00 2001
+From: shizeeg <shizeeque AT gmail.com>
+Date: Thu, 8 Sep 2016 18:24:29 +0300
+Subject: [PATCH] Fix build without X11 (#317)
+
+---
+ src/conky.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index 0a812fc..4c5da94 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -1404,6 +1404,9 @@ static void draw_string(const char *s)
+
+ int draw_each_line_inner(char *s, int special_index, int
last_special_applied)
+ {
++#ifndef BUILD_X11
++ static int cur_x, cur_y; /* current x and y for drawing */
++#endif
+ #ifdef BUILD_X11
+ int font_h = 0;
+ int cur_y_add = 0;
+@@ -1934,6 +1937,7 @@ static void draw_text(void)
+
+ static void draw_stuff(void)
+ {
++ static int text_offset_x, text_offset_y; /* offset for start position
*/
+ text_offset_x = text_offset_y = 0;
+ #ifdef BUILD_IMLIB2
+ cimlib_render(text_start_x, text_start_y, window.width,
window.height);
diff --git a/x11/conky/conky-1.8.1-utf8-scroll.patch
b/x11/conky/conky-1.8.1-utf8-scroll.patch
deleted file mode 100644
index 8b9e1e8..0000000
--- a/x11/conky/conky-1.8.1-utf8-scroll.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From b1f6a30bcce020b3c377434137de9856a09b899a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe AT aidecoe.name>
-Date: Fri, 11 Nov 2011 11:27:43 +0100
-Subject: [PATCH] Make scroll UTF-8 aware. Fixes bug #3134941.
-
----
- src/scroll.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 42 insertions(+), 2 deletions(-)
-
-diff --git a/src/scroll.c b/src/scroll.c
-index f78f807..738db0d 100644
---- a/src/scroll.c
-+++ b/src/scroll.c
-@@ -34,12 +34,33 @@
-
- struct scroll_data {
- char *text;
-+ unsigned int show_orig;
- unsigned int show;
- unsigned int step;
- unsigned int start;
- long resetcolor;
- };
-
-+int utf8_charlen(char c) {
-+ unsigned char uc = (unsigned char) c;
-+ int len = 0;
-+
-+ if ((uc & 0x80) == 0)
-+ return 1;
-+
-+ while ((uc & 0x80) != 0) {
-+ ++len;
-+ uc <<= 1;
-+ }
-+
-+ return (len > 0 && len <= 4) ? len : -1;
-+}
-+
-+int is_utf8_char_tail(char c) {
-+ unsigned char uc = (unsigned char) c;
-+ return (uc & 0xc0) == 0x80;
-+}
-+
- void parse_scroll_arg(struct text_object *obj, const char *arg, void
*free_at_crash)
- {
- struct scroll_data *sd;
-@@ -60,15 +81,18 @@ void parse_scroll_arg(struct text_object *obj, const
char *arg, void *free_at_cr
- sd->step = 1;
- }
- sd->text = malloc(strlen(arg + n1) + sd->show + 1);
-+ // sd->show value may change when there are UTF-8 chars to be shown,
so
-+ // save its origin value
-+ sd->show_orig = sd->show;
-
- if (strlen(arg) > sd->show) {
- for(n2 = 0; (unsigned int) n2 < sd->show; n2++) {
-- sd->text[n2] = ' ';
-+ sd->text[n2] = ' ';
- }
- sd->text[n2] = 0;
- }
- else
-- sd->text[0] = 0;
-+ sd->text[0] = 0;
-
- strcat(sd->text, arg + n1);
- sd->start = 0;
-@@ -82,9 +106,13 @@ void print_scroll(struct text_object *obj, char *p, int
p_max_size, struct infor
- {
- struct scroll_data *sd = obj->data.opaque;
- unsigned int j, colorchanges = 0, frontcolorchanges = 0,
visibcolorchanges = 0, strend;
-+ int charlen = 0;
-+ unsigned int utf8lenfix = 0;
- char *pwithcolors;
- char buf[max_user_text];
-
-+ sd->show = sd->show_orig;
-+
- if (!sd)
- return;
-
-@@ -109,6 +137,18 @@ void print_scroll(struct text_object *obj, char *p, int
p_max_size, struct infor
- while(*(buf + sd->start) == SPECIAL_CHAR) {
- sd->start++;
- }
-+ //skip parts of UTF-8 character which messes up display
-+ while(is_utf8_char_tail(*(buf + sd->start))) {
-+ sd->start++;
-+ }
-+ //extend length to be shown for wide characters
-+ j = 0;
-+ while(j < sd->show + visibcolorchanges + utf8lenfix) {
-+ charlen = utf8_charlen(*(buf + sd->start + j));
-+ utf8lenfix += (charlen > 1 ? charlen - 1 : 0);
-+ j += charlen;
-+ }
-+ sd->show = sd->show_orig + utf8lenfix;
- //place all chars that should be visible in p, including colorchanges
- for(j=0; j < sd->show + visibcolorchanges; j++) {
- p[j] = *(buf + sd->start + j);
---
-1.7.8.rc1
-
diff --git a/x11/conky/conky-1.9.0-apcupsd.patch
b/x11/conky/conky-1.9.0-apcupsd.patch
deleted file mode 100644
index 9161fbc..0000000
--- a/x11/conky/conky-1.9.0-apcupsd.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Description: Fix broken apcupsd support in Conky 1.8.1
- Revert apcupsd-related code to Conky 1.8.0 in order to fix broken apcupsd
- support. This is a workaround until upstream properly addresses this issue.
-From: Brian Derr <bderrly AT gmail.com>
-Forwarded: http://sourceforge.net/support/tracker.php?aid=3083859
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/897495
-Last-Update: 2011-12-02
-
---- a/src/apcupsd.c
-+++ b/src/apcupsd.c
-@@ -154,7 +154,7 @@
- //
- // Conky update function for apcupsd data
- //
--int update_apcupsd(void) {
-+void update_apcupsd(void) {
-
- int i;
- APCUPSD_S apc;
-@@ -164,41 +164,44 @@
- memcpy(apc.items[i], "N/A", 4); // including \0
-
- do {
-- struct addrinfo hints;
-- struct addrinfo *ai, *rp;
-- int res;
-+ struct hostent* he = 0;
-+ struct sockaddr_in addr;
- short sz = 0;
-- char portbuf[8];
-+#ifdef HAVE_GETHOSTBYNAME_R
-+ struct hostent he_mem;
-+ int he_errno;
-+ char hostbuff[2048];
-+#endif
- //
- // connect to apcupsd daemon
- //
-- memset(&hints, 0, sizeof(struct addrinfo));
-- hints.ai_family = AF_UNSPEC;
-- hints.ai_socktype = SOCK_STREAM;
-- hints.ai_flags = 0;
-- hints.ai_protocol = 0;
-- snprintf(portbuf, 8, "%d", info.apcupsd.port);
-- res = getaddrinfo(info.apcupsd.host, portbuf, &hints, &ai);
-- if (res != 0) {
-- NORM_ERR("APCUPSD getaddrinfo: %s",
gai_strerror(res));
-+ sock = socket(AF_INET, SOCK_STREAM, 0);
-+ if (sock < 0) {
-+ perror("socket");
- break;
- }
-- for (rp = ai; rp != NULL; rp = rp->ai_next) {
-- sock = socket(rp->ai_family, rp->ai_socktype,
rp->ai_protocol);
-- if (sock == -1) {
-- continue;
-- }
-- if (connect(sock, rp->ai_addr, rp->ai_addrlen) != -1)
{
-- break;
-- }
-- close(sock);
-+#ifdef HAVE_GETHOSTBYNAME_R
-+ if (gethostbyname_r(info.apcupsd.host, &he_mem, hostbuff,
sizeof(hostbuff), &he, &he_errno) || !he ) {
-+ NORM_ERR("APCUPSD gethostbyname_r: %s",
hstrerror(h_errno));
-+ break;
-+ }
-+#else /* HAVE_GETHOSTBYNAME_R */
-+ he = gethostbyname(info.apcupsd.host);
-+ if (!he) {
-+ herror("gethostbyname");
-+ break;
- }
-- freeaddrinfo(ai);
-- if (rp == NULL) {
-+#endif /* HAVE_GETHOSTBYNAME_R */
-+
-+ memset(&addr, 0, sizeof(addr));
-+ addr.sin_family = AF_INET;
-+ addr.sin_port = info.apcupsd.port;
-+ memcpy(&addr.sin_addr, he->h_addr, he->h_length);
-+ if (connect(sock, (struct sockaddr*)&addr, sizeof(struct
sockaddr)) < 0) {
- // no error reporting, the daemon is probably not
running
- break;
- }
--
-+
- //
- // send status request - "status" - 6B
- //
-@@ -222,5 +225,5 @@
- // "atomically" copy the data into working set
- //
- memcpy(info.apcupsd.items, apc.items, sizeof(info.apcupsd.items));
-- return 0;
-+ return;
- }
---- a/src/apcupsd.h
-+++ b/src/apcupsd.h
-@@ -49,6 +49,6 @@
- } APCUPSD_S, *PAPCUPSD_S;
-
- /* Service routine for the conky main thread */
--int update_apcupsd(void);
-+void update_apcupsd(void);
-
- #endif /*APCUPSD_H_*/
diff --git a/x11/conky/conky-1.9.0-default-graph-size.patch
b/x11/conky/conky-1.9.0-default-graph-size.patch
deleted file mode 100644
index 02f64e3..0000000
--- a/x11/conky/conky-1.9.0-default-graph-size.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -U 5 conky-1.9.0/src/specials.c conky-1.9.0/src/specials.c
---- conky-1.9.0/src/specials.c 2012-05-03 22:13:47.000000000 +0100
-+++ conky-1.9.0/src/specials.c 2013-02-27 21:16:15.856669451 +0000
-@@ -186,12 +186,12 @@
- g->scale = defscale;
- if (sscanf(args, "%1023s %d,%d %x %x", buf, &g->height,
&g->width, &g->first_colour, &g->last_colour) == 5) {
- return strndup(buf, text_buffer_size);
- }
- buf[0] = '\0';
-- g->height = 25;
-- g->width = 0;
-+ g->height = default_graph_height;
-+ g->width = default_graph_width;
- if (sscanf(args, "%x %x %u", &g->first_colour,
&g->last_colour, &g->scale) == 3) {
- return NULL;
- }
- g->scale = defscale;
- if (sscanf(args, "%x %x", &g->first_colour, &g->last_colour)
== 2) {
diff --git a/x11/conky/conky-1.9.0-diskio-dmmajor.patch
b/x11/conky/conky-1.9.0-diskio-dmmajor.patch
deleted file mode 100644
index 754f9dc..0000000
--- a/x11/conky/conky-1.9.0-diskio-dmmajor.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/linux.c b/src/linux.c
-index ce5f733..bbf8dc5 100644
---- a/src/linux.c
-+++ b/src/linux.c
-@@ -80,6 +80,10 @@
- #define NBD_MAJOR 43
- #endif
-
-+#if !defined(DM_MAJOR)
-+#define DM_MAJOR 253
-+#endif
-+
- #ifdef HAVE_IWLIB
- #include <iwlib.h>
- #endif
-@@ -2336,7 +2340,8 @@ int update_diskio(void)
- *
- * XXX: ignore devices which are part of a SW RAID (MD_MAJOR)
*/
- if (col_count == 5 && major != LVM_BLK_MAJOR && major !=
NBD_MAJOR
-- && major != RAMDISK_MAJOR && major !=
LOOP_MAJOR) {
-+ && major != RAMDISK_MAJOR && major !=
LOOP_MAJOR
-+ && major != DM_MAJOR ) {
- /* check needed for kernel >= 2.6.31, see sf #2942117
*/
- if (is_disk(devbuf)) {
- total_reads += reads;
diff --git a/x11/conky/conky-1.9.0-lines-fix.patch
b/x11/conky/conky-1.9.0-lines-fix.patch
deleted file mode 100644
index de48ab9..0000000
--- a/x11/conky/conky-1.9.0-lines-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN old/src/conky.c new/src/conky.c
---- old/src/conky.c 2012-05-03 23:22:21.000000000 +0200
-+++ new/src/conky.c 2012-08-15 00:06:59.256311301 +0200
-@@ -3065,12 +3065,26 @@
- og = g;
- }
-
-- /* this is mugfugly,
but it works */
-- XDrawLine(display,
window.drawable, window.gc,
--
cur_x + i + 1,
--
specials[special_index].dotgraph ? og : by + h,
--
cur_x + i + 1,
-- g);
-+ if
(specials[special_index].dotgraph) {
-+ if (og == g) {
-+
XDrawPoint(display, window.drawable,
-+
window.gc, cur_x + i + 1, g);
-+ } else {
-+
XDrawLine(display, window.drawable, window.gc,
-+
cur_x + i + 1,
-+
og,
-+
cur_x + i + 1,
-+
g);
-+ }
-+ } else {
-+ /* this is
mugfugly, but it works */
-+
XDrawLine(display, window.drawable, window.gc,
-+
cur_x + i + 1,
-+
by + h,
-+
cur_x + i + 1,
-+
g);
-+ }
-+
- ++j;
- }
- if (tmpcolour)
free(tmpcolour);
diff --git a/x11/conky/conky-1.9.0-ncurses.patch
b/x11/conky/conky-1.9.0-ncurses.patch
deleted file mode 100644
index 91043ed..0000000
--- a/x11/conky/conky-1.9.0-ncurses.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fd9462da5ed12369fc6a72e42ebc45c6707403fb Mon Sep 17 00:00:00 2001
-From: Pavel Labath <pavelo AT centrum.sk>
-Date: Fri, 13 Jul 2012 13:41:09 +0200
-Subject: [PATCH] Fix "conky failes to build with --disable-ncurses" (sf.net
#3541329)
-
----
- src/conky.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/conky.c b/src/conky.c
-index c5b4bed..17fe1a7 100644
---- a/src/conky.c
-+++ b/src/conky.c
-@@ -885,12 +885,12 @@ void generate_text_internal(char *p, int p_max_size,
- OBJ(cpu) {
- if (cur->cpu_usage) {
- if (obj->data.i > info.cpu_count) {
-- static bool warned = false;
-+ static int warned = 0;
- if(!warned) {
- NORM_ERR("obj->data.i
%i info.cpu_count %i",
-
obj->data.i, info.cpu_count);
- NORM_ERR("attempting
to use more CPUs than you have!");
-- warned = true;
-+ warned = 1;
- }
- } else {
- percent_print(p, p_max_size,
---
-1.7.0.4
-
diff --git a/x11/conky/conky-1.9.0-update-when-message-count-decreases.patch
b/x11/conky/conky-1.9.0-update-when-message-count-decreases.patch
deleted file mode 100644
index dd422c5..0000000
--- a/x11/conky/conky-1.9.0-update-when-message-count-decreases.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/src/mail.c b/src/mail.c
-index 7f60ba3..882b7c8 100644
---- a/src/mail.c
-+++ b/src/mail.c
-@@ -630,8 +630,15 @@ int imap_check_status(char *recvbuf, struct mail_s
*mail)
-
- void imap_unseen_command(struct mail_s *mail, unsigned long old_unseen,
unsigned long old_messages)
- {
-- if (strlen(mail->command) > 1 && (mail->unseen > old_unseen
-- || (mail->messages > old_messages &&
mail->unseen > 0))) {
-+ /*
-+ * Georg Hopp (2012-12-23):
-+ * Well, i will read mails from time to time and i want the unseen
-+ * count to be reduced when they are read...so, this seems wrong.
-+ * Try a better one.... :)
-+ */
-+ if (strlen(mail->command) > 1
-+ && (mail->unseen != old_unseen
-+ || mail->messages != old_messages)) {
- // new mail goodie
- if (system(mail->command) == -1) {
- perror("system()");
-@@ -813,7 +820,7 @@ static void *imap_thread(void *arg)
- if (strlen(recvbuf) > 2) {
- unsigned long messages,
recent = 0;
- char *buf = recvbuf;
-- char force_check = 0;
-+ char force_check = 1;
- buf = strstr(buf, "EXISTS");
- while (buf && strlen(buf) > 1
&& strstr(buf + 1, "EXISTS")) {
- buf = strstr(buf + 1,
"EXISTS");
-@@ -825,9 +832,7 @@ static void *imap_thread(void *arg)
- }
- if (sscanf(buf, "*
%lu EXISTS\r\n", &messages) == 1) {
-
timed_thread_lock(mail->p_timed_thread);
-- if
(mail->messages != messages) {
--
force_check = 1;
-- }
-+ force_check =
1;
-
timed_thread_unlock(mail->p_timed_thread);
- }
- }
-@@ -850,7 +855,10 @@ static void *imap_thread(void *arg)
- * something other than 0, or
we had a timeout
- */
- buf = recvbuf;
-- if (recent > 0 || (buf &&
strstr(buf, " FETCH ")) || fetchtimeout.tv_sec == 0 || force_check) {
-+ if (recent > 0
-+ || (buf &&
strstr(buf, " FETCH "))
-+ || (buf &&
strstr(buf, " EXPUNGE "))
-+ ||
fetchtimeout.tv_sec == 0 || force_check) {
- // re-check messages
and unseen
- if
(imap_command(sockfd, "DONE\r\n", recvbuf, "a5 OK")) {
- fail++;
-@@ -868,6 +876,9 @@ static void *imap_thread(void *arg)
- fail++;
- break;
- }
-+
imap_unseen_command(mail, old_unseen, old_messages);
-+ old_unseen =
mail->unseen;
-+ old_messages =
mail->messages;
- strncpy(sendbuf, "a5
IDLE\r\n", MAXDATASIZE);
- if
(imap_command(sockfd, sendbuf, recvbuf, "+ idling")) {
- fail++;
-@@ -886,10 +897,7 @@ static void *imap_thread(void *arg)
- fail++;
- break;
- }
-- imap_unseen_command(mail, old_unseen,
old_messages);
- fail = 0;
-- old_unseen = mail->unseen;
-- old_messages = mail->messages;
- }
- if (fail) break;
- } else {



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (607e61020b11a73867f4d8ce289caf7509d42735), Florian Franzmann, 09/10/2016

Archive powered by MHonArc 2.6.24.

Top of Page