Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (218e699273804f4cf28d0215a14bf566f715974f)

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 master grimoire by Eric Sandall (218e699273804f4cf28d0215a14bf566f715974f)
  • Date: Thu, 12 Jan 2012 17:05:51 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11/lightdm/DETAILS | 5 +++--
x11/lightdm/HISTORY | 5 +++++
x11/lightdm/PRE_BUILD | 3 +++
x11/lightdm/lightdm-1.1.0.tar.gz.sig |binary
4 files changed, 11 insertions(+), 2 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

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 master grimoire by Eric Sandall (218e699273804f4cf28d0215a14bf566f715974f), Eric Sandall, 01/12/2012

Archive powered by MHonArc 2.6.24.

Top of Page