Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (f562c64b54e3d1acaccf9653ae1b13db3cac030c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (f562c64b54e3d1acaccf9653ae1b13db3cac030c)
  • Date: Tue, 16 Aug 2011 01:13:28 -0500

GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:

ChangeLog | 3 +++
editors/openoffice/CONFLICTS | 1 +
editors/openoffice/HISTORY | 3 +++
http/firefox/DETAILS | 4 ++--
http/firefox/HISTORY | 4 ++++
http/firefox/mozconfig5 | 2 ++
kde4-bindings/kde4-bindings-profile/DEPENDS | 2 +-
kde4-bindings/kde4-bindings-profile/HISTORY | 3 +++
kde4-bindings/perlqt/CONFIGURE | 1 -
kde4-bindings/perlqt/CONFLICTS | 1 -
kde4-bindings/perlqt/DEPENDS | 1 -
kde4-bindings/perlqt/DETAILS | 14 --------------
kde4-bindings/perlqt/HISTORY | 6 ------
kde4-bindings/perlqt4/CONFIGURE | 1 +
kde4-bindings/perlqt4/CONFLICTS | 1 +
kde4-bindings/perlqt4/DEPENDS | 1 +
kde4-bindings/perlqt4/DETAILS | 15 +++++++++++++++
kde4-bindings/perlqt4/HISTORY | 9 +++++++++
libs/apr-util/DEPENDS | 4 ++--
libs/apr-util/HISTORY | 3 +++
libs/gdbm/BUILD | 10 ++--------
libs/gdbm/DETAILS | 13 ++++++++-----
libs/gdbm/HISTORY | 8 ++++++++
libs/gdbm/INSTALL | 5 ++---
libs/gdbm/UP_TRIGGERS | 15 +++++++++++++++
libs/gdbm/gdbm.gpg |binary
video/miro/DETAILS | 4 ++--
video/miro/HISTORY | 3 +++
28 files changed, 91 insertions(+), 46 deletions(-)

New commits:
commit cb21172ec7655d13b733e2e22bd1f9144425eb07
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kde4-bindings-profile: perlqt -> perlqt4

commit c67e1531d9f76f126c7205b4060c3241e38200bd
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kde4-bindings/perlqt -> perlqt4: to avoid duplicated spells

commit 23418ae0385f951a7c583d400ac172113f87b3a9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

apr-util: corrected info message color

commit bd35fa90f5c73dedc8ca654f223167ea6d9e3809
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gdbm: => 1.9.1

commit b3f0f070900b0437c8a7664345ba33923cc8fba2
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

openoffice: it conflicts with libreoffice-bin

commit b32808619d6b9a3fa42ad0bf770a4c7fad7e6eef
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

miro 4.0.3

commit 5cd1caca331425cfee84b7d005c4a0821938aa5e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

firefox 6.0

switched to system nspr and nss
fails with internal nss, linux 3 problem, fixed in new nss:

make[6]: Entering directory
`/usr/src/firefox-6.0/mozilla-release/security/dbm'
../coreconf/config.mk:71: ../coreconf/Linux3.0.mk: No such file or
directory
/usr/bin/make -j1: *** No rule to make target ../coreconf/Linux3.0.mk.
Stop.
make[6]: *** [../coreconf/Linux3.0.mk] Error 1

diff --git a/ChangeLog b/ChangeLog
index b13b754..14fe061 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * kde4-bindings/perlqt -> perlqt4: to avoid duplicated spells
+
2011-08-15 Justin Boffemmyer <flux AT sourcemage.org>
* devel/sas: new spell, pure POSIX shell-implemented assembler

diff --git a/editors/openoffice/CONFLICTS b/editors/openoffice/CONFLICTS
index e57273a..a088dca 100755
--- a/editors/openoffice/CONFLICTS
+++ b/editors/openoffice/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts libreoffice-bin &&
conflicts openoffice-bin &&
conflicts openoffice2-bin &&
conflicts openoffice3-bin
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 423e4f8..0fadeb4 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with libreoffice-bin
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on gcj to dependency on gcc with
sub-depends on JAVA (scripted)
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index c933eea..a9ac203 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=5.0.1
+ VERSION=6.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=5.0.1
+ VERSION=6.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 53c87c2..a1e4dc4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2011-08-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.0
+ * mozconfig5: --with-system-nspr and --with-system-nss added
+
2011-08-06 George Sherwood <gsherwood AT sourcemage.org>
* CONFIGURE: Added option for safe browsing
* DEPENDS: Added optional depends yasm removed depends yasm
diff --git a/http/firefox/mozconfig5 b/http/firefox/mozconfig5
index 25aef0c..9e9d2f0 100644
--- a/http/firefox/mozconfig5
+++ b/http/firefox/mozconfig5
@@ -18,6 +18,8 @@ ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-freetype2
ac_add_options --enable-pango
ac_add_options --enable-svg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
ac_add_options --disable-dbus
ac_add_options --disable-installer
ac_add_options --disable-updater
diff --git a/kde4-bindings/kde4-bindings-profile/DEPENDS
b/kde4-bindings/kde4-bindings-profile/DEPENDS
index 9194a8b..43e7d19 100755
--- a/kde4-bindings/kde4-bindings-profile/DEPENDS
+++ b/kde4-bindings/kde4-bindings-profile/DEPENDS
@@ -5,7 +5,7 @@ optional_depends qyoto "" "" ".NET/Mono bindings for the Qt
libraries." &&
optional_depends smokekde "" "" "SMOKE bindings for libraries created by the
KDE community. Used by language bindings." &&
optional_depends kimono "" "" ".NET/Mono bindings for the KDE libraries." &&
optional_depends kross-interpreters "" "" "Language interpreters to enable
in-process scripting with Kross." &&
-optional_depends perlqt "" "" "Perl bindings for the Qt libraries." &&
+optional_depends perlqt4 "" "" "Perl bindings for the Qt libraries." &&
optional_depends qtruby "" "" "Ruby bindings for the Qt libraries." &&
optional_depends smokegen "" "" "A general purpose C++ parser with a plugin
infrastructure enabling 'generators'" &&
optional_depends smokeqt "" "" "SMOKE bindings for the Qt libraries. Used by
language bindings."
\ No newline at end of file
diff --git a/kde4-bindings/kde4-bindings-profile/HISTORY
b/kde4-bindings/kde4-bindings-profile/HISTORY
index 4919f50..21accf7 100644
--- a/kde4-bindings/kde4-bindings-profile/HISTORY
+++ b/kde4-bindings/kde4-bindings-profile/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: perlqt -> perlqt4
+
2011-08-15 Bor Kraljič <pyrobor AT ver.si>
* CONFLICTS: it conflicts with kdebindings4
* BUILD, CONFLICTS, DEPENDS, DETAILS, FINAL, INSTALL, PRE_BUILD:
added missing HISTORY file
diff --git a/kde4-bindings/perlqt/CONFIGURE b/kde4-bindings/perlqt/CONFIGURE
deleted file mode 100755
index 3e2e1ef..0000000
--- a/kde4-bindings/perlqt/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4-bindings/perlqt/CONFLICTS b/kde4-bindings/perlqt/CONFLICTS
deleted file mode 100755
index 3697608..0000000
--- a/kde4-bindings/perlqt/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/perlqt/DEPENDS b/kde4-bindings/perlqt/DEPENDS
deleted file mode 100755
index b4b4f02..0000000
--- a/kde4-bindings/perlqt/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-source $SECTION_DIRECTORY/KDE_DEPENDS
diff --git a/kde4-bindings/perlqt/DETAILS b/kde4-bindings/perlqt/DETAILS
deleted file mode 100755
index add074d..0000000
--- a/kde4-bindings/perlqt/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
- SPELL=perlqt
- VERSION=4.7.0
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:18a4a7f156059afac0e92f5716c32f0920fb6a4598fa93ca68500293afeabd893a5828644ae2d036035ec5b6bf621e857e65b9f58e5ca6ece09e304cc9a4664e
- SOURCE_URL=$KDE_URL/stable/$VERSION/src/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://www.kde.org
- ENTERED=20110804
- LICENSE[0]=GPL
- KEYWORDS="kde4"
- SHORT="Perl bindings for the Qt libraries."
-cat << EOF
-Perl bindings for the Qt libraries.
-EOF
diff --git a/kde4-bindings/perlqt/HISTORY b/kde4-bindings/perlqt/HISTORY
deleted file mode 100644
index f032151..0000000
--- a/kde4-bindings/perlqt/HISTORY
+++ /dev/null
@@ -1,6 +0,0 @@
-2011-08-15 Bor Kraljič <pyrobor AT ver.si>
- * CONFLICTS: it conflicts with kdebindings4
-
-2011-08-04 Bor Kraljič <pyrobor AT ver.si>
- * CONFIGURE, DEPENDS, DETAILS: spell created
-
diff --git a/kde4-bindings/perlqt4/CONFIGURE b/kde4-bindings/perlqt4/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4-bindings/perlqt4/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4-bindings/perlqt4/CONFLICTS b/kde4-bindings/perlqt4/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/perlqt4/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/perlqt4/DEPENDS b/kde4-bindings/perlqt4/DEPENDS
new file mode 100755
index 0000000..b4b4f02
--- /dev/null
+++ b/kde4-bindings/perlqt4/DEPENDS
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS
diff --git a/kde4-bindings/perlqt4/DETAILS b/kde4-bindings/perlqt4/DETAILS
new file mode 100755
index 0000000..a4acfe5
--- /dev/null
+++ b/kde4-bindings/perlqt4/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=perlqt4
+ SPELLX=${SPELL//4}
+ VERSION=4.7.0
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:18a4a7f156059afac0e92f5716c32f0920fb6a4598fa93ca68500293afeabd893a5828644ae2d036035ec5b6bf621e857e65b9f58e5ca6ece09e304cc9a4664e
+ SOURCE_URL=$KDE_URL/stable/$VERSION/src/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ WEB_SITE=http://www.kde.org
+ ENTERED=20110804
+ LICENSE[0]=GPL
+ KEYWORDS="kde4"
+ SHORT="Perl bindings for the Qt libraries."
+cat << EOF
+Perl bindings for the Qt libraries.
+EOF
diff --git a/kde4-bindings/perlqt4/HISTORY b/kde4-bindings/perlqt4/HISTORY
new file mode 100644
index 0000000..22bd2cc
--- /dev/null
+++ b/kde4-bindings/perlqt4/HISTORY
@@ -0,0 +1,9 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: renamed spell to perlqt4
+
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
+2011-08-04 Bor Kraljič <pyrobor AT ver.si>
+ * CONFIGURE, DEPENDS, DETAILS: spell created
+
diff --git a/libs/apr-util/DEPENDS b/libs/apr-util/DEPENDS
index 48cbd8c..68d6080 100755
--- a/libs/apr-util/DEPENDS
+++ b/libs/apr-util/DEPENDS
@@ -1,5 +1,5 @@
-message ${WARNING_COLOR}you only need one of:\
- db,gdbm,postgresql,sqlite,sqlite2 ${DEFAULT_COLOUR}&&
+message ${MESSAGE_COLOR}INFO: you only need one of:\
+ db,gdbm,postgresql,sqlite,sqlite2${DEFAULT_COLOR} &&
depends apr "--with-apr=$INSTALL_ROOT/usr" &&
depends expat "--with-expat=$INSTALL_ROOT/usr" &&
optional_depends db \
diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY
index 150cd32..22e3039 100644
--- a/libs/apr-util/HISTORY
+++ b/libs/apr-util/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: corrected info message color
+
2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
* {{REPAIR^all^,}PRE_,}SUB_DEPENDS: added LDAP subdependency

diff --git a/libs/gdbm/BUILD b/libs/gdbm/BUILD
index 2c79c8a..566e631 100755
--- a/libs/gdbm/BUILD
+++ b/libs/gdbm/BUILD
@@ -1,9 +1,3 @@
-sedit "s/-O/$CFLAGS/" Makefile.in
+OPTS="--enable-libgdbm-compat $OPTS" &&

-# Looks like gdbm uses INSTALL_ROOT in its scripts, so we end up
-# with a concatenation of INSTALL_ROOT, not very nice...
-./configure --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- $OPTS &&
-make
+default_build
diff --git a/libs/gdbm/DETAILS b/libs/gdbm/DETAILS
index 2688e1f..a3cc7a8 100755
--- a/libs/gdbm/DETAILS
+++ b/libs/gdbm/DETAILS
@@ -1,14 +1,17 @@
SPELL=gdbm
- VERSION=1.8.3
+ VERSION=1.9.1
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=gdbm.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
LICENSE[0]=GPL
- WEB_SITE=http://www.gnu.org/software/gdbm/gdbm.html
+ WEB_SITE=http://www.gnu.org.ua/software/gdbm/
ENTERED=20010922
KEYWORDS="database libs"
- SHORT="A set of database routines that use extensible hashing."
+ SHORT="set of database routines that use extensible hashing"
cat << EOF
A set of database routines that use extensible hashing. The routines
work like the UNIX dbm routine.
diff --git a/libs/gdbm/HISTORY b/libs/gdbm/HISTORY
index ddb8164..d8b22d7 100644
--- a/libs/gdbm/HISTORY
+++ b/libs/gdbm/HISTORY
@@ -1,3 +1,11 @@
+2011-08-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.1; converted to upstream signature
+ checking
+ * BUILD: not needed anymore, except build compat lib
+ * INSTALL: changed lib version so.3 -> so.4; quoting paths
+ * UP_TRIGGERS: added, to recast dependent spells
+ * gdbm.gpg: added public key 55D0C732 (Sergey Poznyakoff
<gray AT gnu.org>)
+
2009-05-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: delete bad url

diff --git a/libs/gdbm/INSTALL b/libs/gdbm/INSTALL
index f2c61c8..f8c23fd 100755
--- a/libs/gdbm/INSTALL
+++ b/libs/gdbm/INSTALL
@@ -1,8 +1,7 @@
default_install &&

-make install-compat &&
# Preserve the links in chroot
-cd $INSTALL_ROOT/usr/lib &&
-ln -sf libgdbm.so.3.0.0 libndbm.so &&
+cd "$INSTALL_ROOT/usr/lib" &&
+ln -sf libgdbm.so.4.0.0 libndbm.so &&
ln -sf libgdbm.la libndbm.la &&
ln -sf libgdbm.a libndbm.a
diff --git a/libs/gdbm/UP_TRIGGERS b/libs/gdbm/UP_TRIGGERS
new file mode 100755
index 0000000..029cd6d
--- /dev/null
+++ b/libs/gdbm/UP_TRIGGERS
@@ -0,0 +1,15 @@
+# up_trigger everything on major version updates
+
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)"
+
+if spell_ok $SPELL && [[ "${VERSION:2:1}" != "${OLD_SPELL_VERSION:2:1}" ]];
then
+ message "This is a possibly incompatible update of $SPELL..." &&
+ message "Figuring out what spells need to be recast, this may take a
while." &&
+
+ for each in $(show_up_depends $SPELL 1); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libgdbm\.so\.3"; then
+ up_trigger $each cast_self
+ fi
+ done
+fi
diff --git a/libs/gdbm/gdbm.gpg b/libs/gdbm/gdbm.gpg
new file mode 100644
index 0000000..7124985
Binary files /dev/null and b/libs/gdbm/gdbm.gpg differ
diff --git a/video/miro/DETAILS b/video/miro/DETAILS
index 7178b1a..71849f5 100755
--- a/video/miro/DETAILS
+++ b/video/miro/DETAILS
@@ -1,9 +1,9 @@
SPELL=miro
- VERSION=4.0.2.1
+ VERSION=4.0.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.osuosl.org/pub/pculture.org/miro/src/$SOURCE
-
SOURCE_HASH=sha512:e53a187c4f90c64fa35533aa62a95a4887ceb07ddb3b092d43ad4bf551da500bea53e12e3b12b7b98e7ab123491420626bdb6a2b789b48f64ee9ad19512f198f
+
SOURCE_HASH=sha512:0731ece624444497fb125842e4fc524d8b0782d44d9e84c85a64df73ccb4e7e7bb421a73f137902b4a062c834285e8ce52afda483a38489eff1d87eb47021d52
WEB_SITE=http://www.getmiro.com/
ENTERED=20090804
LICENSE[0]=GPL
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index f439e77..d7438da 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.0.3
+
2011-07-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.0.2.1




  • [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (f562c64b54e3d1acaccf9653ae1b13db3cac030c), Bor Kraljič, 08/16/2011

Archive powered by MHonArc 2.6.24.

Top of Page