Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (e6a41b029f5125268d71dc94efc0b8f022a450ac)

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 devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (e6a41b029f5125268d71dc94efc0b8f022a450ac)
  • Date: Wed, 29 Apr 2015 11:35:10 -0500

GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 2 ++
FUNCTIONS | 12 ++++++------
audio-players/cantata/DEPENDS | 2 +-
audio-players/cantata/HISTORY | 3 +++
chat-im/choqok/BUILD | 1 -
chat-im/choqok/DEPENDS | 3 ---
chat-im/choqok/DETAILS | 40 ----------------------------------------
chat-im/choqok/HISTORY | 17 -----------------
chat-im/choqok/PREPARE | 2 --
kde4-apps/choqok/CONFIGURE | 1 +
kde4-apps/choqok/DEPENDS | 3 +++
kde4-apps/choqok/DETAILS | 40 ++++++++++++++++++++++++++++++++++++++++
kde4-apps/choqok/HISTORY | 23 +++++++++++++++++++++++
kde4-apps/choqok/PREPARE | 2 ++
net/libproxy/DEPENDS | 2 +-
net/libproxy/HISTORY | 3 +++
16 files changed, 85 insertions(+), 71 deletions(-)

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

FUNCTIONS - fix qt4_build

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

libproxy - fix depends

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

cantata - fix depends

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

choqok: => 1.5

diff --git a/ChangeLog b/ChangeLog
index df4964f..e53cdb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
* add plasma spells from github
* add kde5 spells from github
* add missing baloo-widgets ballo
+ * move choqok
+ * FUNCTIONS: fix qt4_build, qt4_cmake_build

2015-04-27 Pavel Vinogradov <public AT sourcemage.org>
* http/webkitfltk: new spell, FLTK port of WebKit
diff --git a/FUNCTIONS b/FUNCTIONS
index 0fc1d49..e450b9d 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -565,15 +565,15 @@ cmake_build() {
}

qt4_cmake_build() {
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
- PATH="$QTDIR/bin/qt4:$PATH"
- cmake_build
+ PATH="$QT4DIR/bin/:$PATH"
+ export PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig"
+ cmake_build $QT4DIR
}

qt4_build() {
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
- PATH="$QTDIR/bin/qt4:$PATH"
- qmake PREFIX=$INSTALL_ROOT/usr &&
+ cd $SOURCE_DIRECTORY &&
+ PATH="$QT4DIR/bin:$PATH"
+ qmake PREFIX=$QT4DIR $OPTS $SRC/*.pro &&
make
}

diff --git a/audio-players/cantata/DEPENDS b/audio-players/cantata/DEPENDS
index 5d31183..078b079 100755
--- a/audio-players/cantata/DEPENDS
+++ b/audio-players/cantata/DEPENDS
@@ -1,6 +1,6 @@
depends -sub DBUS qt4 &&
depends qjson &&
-optional_depends kdelibs4 \
+optional_depends kdelibs \
"-DENABLE_KDE=on" \
"-DENABLE_KDE=off" \
"support for KDE 4" &&
diff --git a/audio-players/cantata/HISTORY b/audio-players/cantata/HISTORY
index bde9de9..f60b4ba 100644
--- a/audio-players/cantata/HISTORY
+++ b/audio-players/cantata/HISTORY
@@ -1,3 +1,6 @@
+2015-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix kdelibs usage
+
2014-05-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.3.4

diff --git a/chat-im/choqok/BUILD b/chat-im/choqok/BUILD
deleted file mode 100755
index 2113434..0000000
--- a/chat-im/choqok/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-qt4_cmake_build
diff --git a/chat-im/choqok/DEPENDS b/chat-im/choqok/DEPENDS
deleted file mode 100755
index e8c42ea..0000000
--- a/chat-im/choqok/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends qjson &&
-depends qoauth &&
-depends kdelibs4
diff --git a/chat-im/choqok/DETAILS b/chat-im/choqok/DETAILS
deleted file mode 100755
index 26cd449..0000000
--- a/chat-im/choqok/DETAILS
+++ /dev/null
@@ -1,40 +0,0 @@
-. "$GRIMOIRE/FUNCTIONS"
- SPELL=choqok
-if [[ "$CHOQOK_BRANCH" = scm ]]; then
- VERSION=$(get_scm_version)
- SOURCE="${SPELL}-git.tar.bz2"
- SOURCE_URL=git://git.kde.org/choqok
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
-else
- VERSION=1.1
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
-
SOURCE_URL[0]=http://downloads.sourceforge.net/project/$SPELL/Choqok/$SOURCE
-
SOURCE_HASH=sha512:496247424fc099a9f8a61abd145a0876f42a9af50cee97f507b4258d97a4fb0092fdc65213954aa5629a5dbfc28e6e3a3c2150c4234202223a88f7c64cd14d43
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-fi
- WEB_SITE="http://choqok.gnufolks.org";
- LICENSE[0]=GPL
- ENTERED=20110111
- SHORT="micro-blogging client for KDE"
-cat << EOF
-Features support for:
-
- * Twitter, identi.ca and self-hosted StatusNet micro-blogging service.
- * Open Collaboration Services API (Used by opendesktop.org). * Friends,
- @Reply, Favorite and Public time-lines. * Direct messages. * Multiple
- Accounts simultaneously. * Search APIs for Twitter and StatusNet services.
- * Twitter lists. * URL shortening services. * Image and video preview from
- various services. * Official Repeat/ReTweet functions. * Photo uploading
- to various services.
-
-Other features:
-
- * KWallet integration. * Ability to make a quick tweet/dent with global
- shortcuts. (Ctrl+Meta+T) * Ability to notify user about new statuses
arriving.
- * Status list apperance customization. * Filtering. * Setting your last
- post as current status message in IM clients (Kopete, Pidgin, Psi, Skype).
- * Send Now Listening text. (Amarok, Exaile, Banshee, Rhythmbox, VLC, etc.)
- * UnTiny short Urls. * Proxy support.
-EOF
diff --git a/chat-im/choqok/HISTORY b/chat-im/choqok/HISTORY
deleted file mode 100644
index 3540463..0000000
--- a/chat-im/choqok/HISTORY
+++ /dev/null
@@ -1,17 +0,0 @@
-2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: Use get_scm_version
-
-2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
- * PREPARE, DETAILS: Use prepare_select_branch
-
-2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: Fixed SOURCE_URL[0]
- updated spell to 1.1
-
-2011-01-12 Ismael Luceno <ismael AT sourcemage.org>
- * PREPARE, DETAILS: add scm version
- * DEPENDS: depends on kdelibs4
-
-2011-01-11 Ismael Luceno <ismael AT sourcemage.org>
- * DEPENDS, DETAILS: spell created
-
diff --git a/chat-im/choqok/PREPARE b/chat-im/choqok/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/chat-im/choqok/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/kde4-apps/choqok/CONFIGURE b/kde4-apps/choqok/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/kde4-apps/choqok/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/kde4-apps/choqok/DEPENDS b/kde4-apps/choqok/DEPENDS
new file mode 100755
index 0000000..d7cb365
--- /dev/null
+++ b/kde4-apps/choqok/DEPENDS
@@ -0,0 +1,3 @@
+source $GRIMOIRE/KDE4_DEPENDS &&
+depends qjson &&
+depends qoauth
diff --git a/kde4-apps/choqok/DETAILS b/kde4-apps/choqok/DETAILS
new file mode 100755
index 0000000..1aab07c
--- /dev/null
+++ b/kde4-apps/choqok/DETAILS
@@ -0,0 +1,40 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=choqok
+if [[ "$CHOQOK_BRANCH" = scm ]]; then
+ VERSION=$(get_scm_version)
+ SOURCE="${SPELL}-git.tar.bz2"
+ SOURCE_URL=git://git.kde.org/choqok
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+else
+ VERSION=1.5
+
SOURCE_HASH=sha512:fbb31abedd07ea1c674a7d59b4a18808ca03812ac37c60ea67d2d641668be4a9137e9f4573eda1e19425123601e9536971170e3948c1e5098b220991571a2cf3
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/$SPELL/Choqok/$SOURCE
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
+ WEB_SITE="http://choqok.gnufolks.org";
+ LICENSE[0]=GPL
+ ENTERED=20110111
+ SHORT="micro-blogging client for KDE"
+cat << EOF
+Features support for:
+
+ * Twitter, identi.ca and self-hosted StatusNet micro-blogging service.
+ * Open Collaboration Services API (Used by opendesktop.org). * Friends,
+ @Reply, Favorite and Public time-lines. * Direct messages. * Multiple
+ Accounts simultaneously. * Search APIs for Twitter and StatusNet services.
+ * Twitter lists. * URL shortening services. * Image and video preview from
+ various services. * Official Repeat/ReTweet functions. * Photo uploading
+ to various services.
+
+Other features:
+
+ * KWallet integration. * Ability to make a quick tweet/dent with global
+ shortcuts. (Ctrl+Meta+T) * Ability to notify user about new statuses
arriving.
+ * Status list apperance customization. * Filtering. * Setting your last
+ post as current status message in IM clients (Kopete, Pidgin, Psi, Skype).
+ * Send Now Listening text. (Amarok, Exaile, Banshee, Rhythmbox, VLC, etc.)
+ * UnTiny short Urls. * Proxy support.
+EOF
diff --git a/kde4-apps/choqok/HISTORY b/kde4-apps/choqok/HISTORY
new file mode 100644
index 0000000..420eadc
--- /dev/null
+++ b/kde4-apps/choqok/HISTORY
@@ -0,0 +1,23 @@
+2015-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5
+ * DEPENDS: fix
+ * BUILD: delete
+ * CONFIGURE: added
+
+2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Use get_scm_version
+
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE, DETAILS: Use prepare_select_branch
+
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 1.1
+
+2011-01-12 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE, DETAILS: add scm version
+ * DEPENDS: depends on kdelibs4
+
+2011-01-11 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/kde4-apps/choqok/PREPARE b/kde4-apps/choqok/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/kde4-apps/choqok/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/net/libproxy/DEPENDS b/net/libproxy/DEPENDS
index 0e88e3f..38c0f16 100755
--- a/net/libproxy/DEPENDS
+++ b/net/libproxy/DEPENDS
@@ -9,7 +9,7 @@ elif [ "$LIBPROXY_WEBKIT" == "gtk+3" ]; then
depends webkitgtk3 '-DWITH_WEBKIT3=1' ''
fi &&

-optional_depends kdelibs4 '-DWITH_KDE4=1' '-DWITH_KDE4=0' 'KDE integration'
&&
+optional_depends kdelibs '-DWITH_KDE4=1' '-DWITH_KDE4=0' 'KDE integration'
&&
optional_depends gconf2 '-DWITH_GNOME=1' '-DWITH_GNOME=0' 'Gnome2
support' &&
optional_depends glib2 '-DWITH_GNOME3=1' '-DWITH_GNOME3=0' 'Gnome3
support' &&
optional_depends network-manager '-DWITH_NM=1' '-DWITH_MM=0' 'Network
Manager support' &&
diff --git a/net/libproxy/HISTORY b/net/libproxy/HISTORY
index 5f8ea3d..9240df2 100644
--- a/net/libproxy/HISTORY
+++ b/net/libproxy/HISTORY
@@ -1,3 +1,6 @@
+2015-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix kdelibs usage
+
2013-01-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.11




  • [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (e6a41b029f5125268d71dc94efc0b8f022a450ac), Treeve Jelbert, 04/29/2015

Archive powered by MHonArc 2.6.24.

Top of Page