Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (b69a0a6d23bdac24a7c9a11f16833d4f68e1b629)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (b69a0a6d23bdac24a7c9a11f16833d4f68e1b629)
  • Date: Thu, 12 Jan 2012 17:19:23 -0600

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

ChangeLog | 6 ++++++
crypto/pcsc-tools/DETAILS | 2 +-
crypto/pcsc-tools/HISTORY | 3 +++
disk/dosfstools/DETAILS | 2 +-
disk/dosfstools/HISTORY | 3 +++
graphics-libs/libvisio/DEPENDS | 2 ++
graphics-libs/libvisio/DETAILS | 14 ++++++++++++++
graphics-libs/libvisio/HISTORY | 2 ++
kde4-apps/FUNCTIONS | 7 ++++---
shell-term-fm/rdesktop/DETAILS | 4 ++--
shell-term-fm/rdesktop/HISTORY | 3 +++
x11/lightdm/DETAILS | 5 +++--
x11/lightdm/HISTORY | 5 +++++
x11/lightdm/PRE_BUILD | 3 +++
x11/lightdm/lightdm-1.1.0.tar.gz.sig |binary
15 files changed, 52 insertions(+), 9 deletions(-)

New commits:
commit 218e699273804f4cf28d0215a14bf566f715974f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

lightdm: Updated to 1.1.0
Remove lightdm-session tests (missing)

commit 969800fc8bb2cf76cf69b0d1f4f887ed0f6a1f2a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

lightdm: Remove MOC files (need to be regenerated with qt 4.8)

The old MOC files were generated using qt 4.7, which gives the following
error when used with qt 4.8 headers:
greeter_moc.cpp:14:2: error: #error "This file was generated using the
moc from 4.7.4. It"
greeter_moc.cpp:15:2: error: #error "cannot be used with the include
files from this version of Qt."
greeter_moc.cpp:16:2: error: #error "(The moc has changed too much.)"

commit d11f0149ad4a99a96293daf16f8c154b0e2a7028
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "lightdm: Disable qt4 support (works only with qt 4.7, not 4.8)"

This reverts commit ffa07e8e41b47d74828d5cecddd8cd17bc5f71c7.

Found a fix to work with qt 4.8 (rebuild MOC files).

commit 2c0aea4f221bfb6a52996815a0817f1d54bc70ea
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

lightdm: Disable qt4 support (works only with qt 4.7, not 4.8)

Making all in liblightdm-qt
make[2]: Entering directory `/usr/src/lightdm-1.0.6/liblightdm-qt'
CXX liblightdm_qt_1_la-greeter_moc.lo
greeter_moc.cpp:14:2: error: #error "This file was generated using the
moc from 4.7.4. It"
greeter_moc.cpp:15:2: error: #error "cannot be used with the include
files from this version of Qt."
greeter_moc.cpp:16:2: error: #error "(The moc has changed too much.)"
make[2]: *** [liblightdm_qt_1_la-greeter_moc.lo] Error 1

commit 6a649defadf2f5d5bef76e2a2009707d29027a8f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

kde4-apps/FUNCTIONS fix path to find correct QT binaries

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

dosfstools: => 3.0.12

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

graphics-libs/libvisio: new spell, library for visio diagrams

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

pcsc-tools 1.4.18

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

rdesktop 1.7.1

diff --git a/ChangeLog b/ChangeLog
index 2488f82..b6f5b0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-13 Thomas Orgis <sobukus AT sourcemage.org>
+ * kde4-apps/FUNCTIONS: ensure build finds correct QT binaries first
+
+2012-01-12 Ladislav Hagara <hgr AT vabo.cz>
+ * graphics-libs/libvisio: new spell, library for visio diagrams
+
2012-01-10 Eric Sandall <sandalle AT sourcemage.org>
* x11-libs/ido: Widgets and other objects used for indicators (missing
dependency for indicator-datetime).
diff --git a/crypto/pcsc-tools/DETAILS b/crypto/pcsc-tools/DETAILS
index 7347742..93aa254 100755
--- a/crypto/pcsc-tools/DETAILS
+++ b/crypto/pcsc-tools/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcsc-tools
- VERSION=1.4.17
+ VERSION=1.4.18
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/crypto/pcsc-tools/HISTORY b/crypto/pcsc-tools/HISTORY
index 0303417..5855597 100644
--- a/crypto/pcsc-tools/HISTORY
+++ b/crypto/pcsc-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-01-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.18
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* E07F1CF9.gpg: added gpg keyring
diff --git a/disk/dosfstools/DETAILS b/disk/dosfstools/DETAILS
index 9e95545..5be5eb5 100755
--- a/disk/dosfstools/DETAILS
+++ b/disk/dosfstools/DETAILS
@@ -1,5 +1,5 @@
SPELL=dosfstools
- VERSION=3.0.11
+ VERSION=3.0.12
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/dosfstools/HISTORY b/disk/dosfstools/HISTORY
index 17d5946..822787c 100644
--- a/disk/dosfstools/HISTORY
+++ b/disk/dosfstools/HISTORY
@@ -1,3 +1,6 @@
+2012-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.12
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 4B2B2B9E.gpg: added gpg keyring
diff --git a/graphics-libs/libvisio/DEPENDS b/graphics-libs/libvisio/DEPENDS
new file mode 100755
index 0000000..f657085
--- /dev/null
+++ b/graphics-libs/libvisio/DEPENDS
@@ -0,0 +1,2 @@
+depends libwpd &&
+depends libwpg
diff --git a/graphics-libs/libvisio/DETAILS b/graphics-libs/libvisio/DETAILS
new file mode 100755
index 0000000..982ad52
--- /dev/null
+++ b/graphics-libs/libvisio/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=libvisio
+ VERSION=0.0.12
+
SOURCE_HASH=sha512:f60595a2d34b81d80d571173f91ad833da864deb5ea7ffe8a95dd59a1b33fb54a28c355c6809c43304d8761ecb4ff2e24bc3b2a6d25ff982118f82c344379a7d
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://dev-www.libreoffice.org/src/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.freedesktop.org/wiki/Software/libvisio
+ LICENSE[0]=GPL
+ ENTERED=20120112
+ SHORT="library for interpret and import visio diagrams"
+cat << EOF
+Libvisio is library providing ability to interpret and import visio diagrams
+into various applications. You can find it being used in libreoffice.
+EOF
diff --git a/graphics-libs/libvisio/HISTORY b/graphics-libs/libvisio/HISTORY
new file mode 100644
index 0000000..433a043
--- /dev/null
+++ b/graphics-libs/libvisio/HISTORY
@@ -0,0 +1,2 @@
+2011-01-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 0.0.12
diff --git a/kde4-apps/FUNCTIONS b/kde4-apps/FUNCTIONS
index 2ea66b4..527e375 100755
--- a/kde4-apps/FUNCTIONS
+++ b/kde4-apps/FUNCTIONS
@@ -1,12 +1,13 @@
prepare_environment() {
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
- PATH="$QTDIR/bin/qt4:$PATH" &&
-
persistent_add KDE4DIR &&
KDE4DIR="$INSTALL_ROOT/usr" &&
KDE4ETC="$INSTALL_ROOT/etc" &&

PATH="$KDE4DIR/bin:$PATH" &&
+ # Correct QT binaries need to be found first!
+ QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+ PATH="$QTDIR/bin/qt4:$PATH" &&
+
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
QT_PLUGIN_PATH="$KDE4DIR/lib/kde4/plugins"
}
diff --git a/shell-term-fm/rdesktop/DETAILS b/shell-term-fm/rdesktop/DETAILS
index 1b19ae7..2fbd39c 100755
--- a/shell-term-fm/rdesktop/DETAILS
+++ b/shell-term-fm/rdesktop/DETAILS
@@ -1,10 +1,10 @@
SPELL=rdesktop
- VERSION=1.7.0
+ VERSION=1.7.1
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:08ebf8181c23bd68f42e9c0ee6a8d8bfe4272659ee1ab6aa17cb6feebc42d14ee44075506947a25cfb895a7c8a57ecad274fb11762e32c175ee2e46b540b20d1
+
SOURCE_HASH=sha512:aaefbcda77a333ec065e42aa20e5335e48c51858dab860495528b399696c0ed6594ab9c5234716682e7ebef81d36cc6d157eedae700e0df209da9034d04887fc
WEB_SITE=http://www.rdesktop.org
ENTERED=20010922
LICENSE[0]=GPL3
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index 173865a..117b112 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,6 @@
+2012-01-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.7.1
+
2011-04-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.7.0, GPL2 -> GPL3, SECURITY_PATCH=2

diff --git a/x11/lightdm/DETAILS b/x11/lightdm/DETAILS
index 857d5f8..97bff7f 100755
--- a/x11/lightdm/DETAILS
+++ b/x11/lightdm/DETAILS
@@ -1,8 +1,9 @@
SPELL=lightdm
- VERSION=1.0.6
+ VERSION=1.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"

SOURCE_URL[0]=http://launchpad.net/${SPELL}/trunk/${VERSION}/+download/${SOURCE}
-
SOURCE_HASH=sha512:6d0e6fe7e038e3c9200563e2baea684d8c675fb9e568d6d65f83fd512d2fa94fffbef785e882566487c3d83c6d493f0c1da14d0ed9bbb6dd617cbfac68fdfd2a
+#
SOURCE_HASH=sha512:6d0e6fe7e038e3c9200563e2baea684d8c675fb9e568d6d65f83fd512d2fa94fffbef785e882566487c3d83c6d493f0c1da14d0ed9bbb6dd617cbfac68fdfd2a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://launchpad.net/lightdm";
LICENSE[0]=GPL3/LGPL3
diff --git a/x11/lightdm/HISTORY b/x11/lightdm/HISTORY
index f23bb14..cbeb8af 100644
--- a/x11/lightdm/HISTORY
+++ b/x11/lightdm/HISTORY
@@ -1,3 +1,8 @@
+2012-01-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.0
+ * PRE_BUILD: Remove MOC files (need to be regenerated with qt 4.8)
+ Remove lightdm-session tests (missing)
+
2011-12-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: fixed typo that prevented the installation if pam
is used
diff --git a/x11/lightdm/PRE_BUILD b/x11/lightdm/PRE_BUILD
new file mode 100755
index 0000000..7eb4e34
--- /dev/null
+++ b/x11/lightdm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+find "${SOURCE_DIRECTORY}" -type f -iname '*moc*' -exec rm -f {} \; &&
+sed -i 's/.*lightdm-session//' "${SOURCE_DIRECTORY}"/tests/src/Makefile.*
diff --git a/x11/lightdm/lightdm-1.1.0.tar.gz.sig
b/x11/lightdm/lightdm-1.1.0.tar.gz.sig
new file mode 100644
index 0000000..0b6a0b7
Binary files /dev/null and b/x11/lightdm/lightdm-1.1.0.tar.gz.sig differ



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (b69a0a6d23bdac24a7c9a11f16833d4f68e1b629), Eric Sandall, 01/12/2012

Archive powered by MHonArc 2.6.24.

Top of Page