Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (d29379112129e832d264ec58ba049a82674fa3e8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (d29379112129e832d264ec58ba049a82674fa3e8)
  • Date: Tue, 4 Mar 2008 12:24:24 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

ChangeLog | 4 ++++
groups | 3 ++-
kde-apps/knetstats/BUILD | 1 +
kde-apps/knetstats/DEPENDS | 1 +
kde-apps/knetstats/DETAILS | 15 +++++++++++++++
kde-apps/knetstats/HISTORY | 3 +++
utils/avahi/BUILD | 2 +-
utils/avahi/DETAILS | 4 ++--
utils/avahi/HISTORY | 7 +++++++
utils/avahi/PRE_BUILD | 4 ++--
utils/avahi/dbus.patch | 13 -------------
utils/avahi/qt.patch | 17 ++++++++---------
12 files changed, 46 insertions(+), 28 deletions(-)

New commits:
commit d29379112129e832d264ec58ba049a82674fa3e8
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

knetstats: new spell, a KDE network monitor

commit 76330f7a6dc4f6aa75c9abb3f50c8c3d1ec5b6f9
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

avahi: updated version to 0.6.22
spell now creates and uses avahi group (fixes bug #14184)
dbus.patch has been removed, as it's no longer needed
qt.patch has been adapted to the newer version of this spell

commit 3aeef420805d3446a358555c4b2b8b9cb050f802
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

groups: added group avahi with gid 162; fixed kde4 group format

diff --git a/ChangeLog b/ChangeLog
index 51ef54a..4ac1ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * groups: added avahi (gid=162)
+ * kde-apps/knetstats: new spell, a KDE network monitor
+
2008-03-03 Treeve Jelbert <treeve AT sourcemage.org>
* gnome2-apps/gnucash2: spell deprecated [replaced by ]

diff --git a/groups b/groups
index e5c9e41..fc5cf99 100755
--- a/groups
+++ b/groups
@@ -81,6 +81,7 @@ stb-admin:157:
davfs2:158:
dovecot:159:
netdev:160:
-kde4:161
+kde4:161:
+avahi:162:
users:1000:
nogroup:65534:
diff --git a/kde-apps/knetstats/BUILD b/kde-apps/knetstats/BUILD
new file mode 100755
index 0000000..39ad889
--- /dev/null
+++ b/kde-apps/knetstats/BUILD
@@ -0,0 +1 @@
+default_kde3_build
diff --git a/kde-apps/knetstats/DEPENDS b/kde-apps/knetstats/DEPENDS
new file mode 100755
index 0000000..515a5ee
--- /dev/null
+++ b/kde-apps/knetstats/DEPENDS
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS
diff --git a/kde-apps/knetstats/DETAILS b/kde-apps/knetstats/DETAILS
new file mode 100755
index 0000000..7672e86
--- /dev/null
+++ b/kde-apps/knetstats/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=knetstats
+ VERSION=1.6.1
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:59456fb941d77ece250cb3bec0074d35f5f3990603a294e9dcc9194992391ee8d9784de604dc600663eb248c1e82ed9cbf32768cf6d3326d3183c071e9443868
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://knetstats.sourceforge.net/";
+ LICENSE[0]=GPL
+ ENTERED=20080304
+ SHORT="a KDE network monitor"
+cat << EOF
+KNetStats is a simple KDE network monitor that show rx/tx LEDs or numeric
+information about the transfer rate of any network interface in a system
+tray icon.
+EOF
diff --git a/kde-apps/knetstats/HISTORY b/kde-apps/knetstats/HISTORY
new file mode 100644
index 0000000..3d46b4a
--- /dev/null
+++ b/kde-apps/knetstats/HISTORY
@@ -0,0 +1,3 @@
+2008-03-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * BUILD, DEPENDS, DETAILS, HISTORY: spell created
+
diff --git a/utils/avahi/BUILD b/utils/avahi/BUILD
index 0d80a6a..b5cd0b1 100755
--- a/utils/avahi/BUILD
+++ b/utils/avahi/BUILD
@@ -1,2 +1,2 @@
-OPTS="${OPTS} --with-distro=none --with-avahi-user=root
--with-avahi-group=nogroup" &&
+OPTS="${OPTS} --with-distro=none --with-avahi-user=root
--with-avahi-group=avahi" &&
default_build
diff --git a/utils/avahi/DETAILS b/utils/avahi/DETAILS
index 2cd06f9..3e736a0 100755
--- a/utils/avahi/DETAILS
+++ b/utils/avahi/DETAILS
@@ -1,8 +1,8 @@
SPELL=avahi
- VERSION=0.6.21
+ VERSION=0.6.22
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL=http://avahi.org/download/${SOURCE}
-
SOURCE_HASH=sha512:dfc1610d751071d179cff679ec265daaaa9a814e21f86237d4c70df4d06bc8e46f9274f418b29860608bf3f924ed0da2bd890297517020197d20455dcdd746eb
+
SOURCE_HASH=sha512:21220fa8ab6193cbf55b35d39360f4c01bdcab68a0a9dc32da1a32b81270855c4c02079761b767a88d320ddd1397ddadcd099d9c3b712ed6b4f0f4550c17ae12
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SECURITY_PATCH=2
LICENSE[0]=GPL
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 9f6aa5c..472b587 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,10 @@
+2008-03-03 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 0.6.22
+ * BUILD, PRE_BUILD: spell now creates and uses avahi group
+ (fixes bug #14184)
+ * PRE_BUILD, dbus.patch: patch removed, no longer needed
+ * qt.patch: adapted to this version
+
2007-12-27 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 0.6.21, removed PATCHLEVEL
* PRE_BUILD, dbus.patch: added patch to compile with dbus < 1.1.1
diff --git a/utils/avahi/PRE_BUILD b/utils/avahi/PRE_BUILD
index 5583d63..b38a6de 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p1 < $SPELL_DIRECTORY/qt.patch &&
-patch -p2 < $SCRIPT_DIRECTORY/dbus.patch &&
autoreconf &&
-create_group netdev
+create_group netdev &&
+create_group avahi
diff --git a/utils/avahi/dbus.patch b/utils/avahi/dbus.patch
deleted file mode 100644
index 7736f41..0000000
--- a/utils/avahi/dbus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /trunk/avahi-common/dbus-watch-glue.c (revision 1507)
-+++ /trunk/avahi-common/dbus-watch-glue.c (revision 1518)
-@@ -135,5 +135,9 @@
- if (!(avahi_watch = poll_api->watch_new(
- poll_api,
-+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 &&
DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR >
1) || (DBUS_VERSION_MAJOR > 1)
- dbus_watch_get_unix_fd(dbus_watch),
-+#else
-+ dbus_watch_get_fd(dbus_watch),
-+#endif
- translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)),
- watch_callback,
-
diff --git a/utils/avahi/qt.patch b/utils/avahi/qt.patch
index 3295a34..85ad1df 100644
--- a/utils/avahi/qt.patch
+++ b/utils/avahi/qt.patch
@@ -1,21 +1,20 @@
-diff -uNr avahi-0.6.17/configure.ac avahi-0.6.17.cp/configure.ac
---- avahi-0.6.17/configure.ac 2007-01-05 23:43:43.000000000 +0100
-+++ avahi-0.6.17.cp/configure.ac 2007-03-06 17:11:45.000000000 +0100
-@@ -343,7 +343,7 @@
+--- avahi-0.6.22/configure.ac 2007-12-17 16:35:51.000000000 +0100
++++ avahi-0.6.22.cp/configure.ac 2008-03-03 22:30:16.000000000 +0100
+@@ -475,7 +475,7 @@
QT3_PREFIX="`$PKG_CONFIG --variable=prefix qt-mt`/bin"
MOC_QT3="no"
AC_CHECK_FILE( "$QT3_PREFIX/moc-qt3", [
MOC_QT3=$QT3_PREFIX/moc-qt3 ], [
-- AC_CHECK_FILE("$QT3_PREFIX/moc", [
MOC_QT3=$QT3_PREFIX/moc ], [
-+ AC_CHECK_FILE("/usr/bin/moc", [ MOC_QT3=/usr/bin/moc ], [
+- AC_CHECK_FILE("$QT3_PREFIX/moc", [
MOC_QT3=$QT3_PREFIX/moc ], [
++ AC_CHECK_FILE("/usr/bin/moc", [ MOC_QT3=/usr/bin/moc ], [
AC_MSG_ERROR([Couldn't find QT3 moc])])])
AC_SUBST(MOC_QT3)
fi
-@@ -368,7 +368,7 @@
+@@ -500,7 +500,7 @@
QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"
MOC_QT4="no"
AC_CHECK_FILE( "$QT4_PREFIX/moc-qt4", [
MOC_QT4=$QT4_PREFIX/moc-qt4 ], [
-- AC_CHECK_FILE("$QT4_PREFIX/moc", [ MOC_QT4=$QT4_PREFIX/moc
], [
-+ AC_CHECK_FILE("/usr/bin/qt4/moc", [
MOC_QT4=/usr/bin/qt4/moc ], [
+- AC_CHECK_FILE("$QT4_PREFIX/moc", [ MOC_QT4=$QT4_PREFIX/moc
], [
++ AC_CHECK_FILE("/usr/bin/qt4/moc", [
MOC_QT4=/usr/bin/qt4/moc ], [
AC_MSG_ERROR([Couldn't find QT4 moc])])])
AC_SUBST(MOC_QT4)
fi



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (d29379112129e832d264ec58ba049a82674fa3e8), Julien ROZO, 03/04/2008

Archive powered by MHonArc 2.6.24.

Top of Page