Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2ff7819857dfd3235e5ba07cd283c0dfa9007d7b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2ff7819857dfd3235e5ba07cd283c0dfa9007d7b)
  • Date: Thu, 21 May 2015 14:31:10 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

disk/mtpfs/DETAILS | 6 ++--
disk/mtpfs/HISTORY | 3 ++
kde4-apps/kaffeine4/HISTORY | 4 +++
kde4-apps/kaffeine4/PRE_BUILD | 3 ++
kde4-apps/kaffeine4/fix-build-gcc-4.7.patch | 35
++++++++++++++++++++++++++++
5 files changed, 48 insertions(+), 3 deletions(-)

New commits:
commit 2ff7819857dfd3235e5ba07cd283c0dfa9007d7b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mtpfs: bump to 1.1 (old source gone)

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

kaffeine4: fix for gcc >= 4.7

diff --git a/disk/mtpfs/DETAILS b/disk/mtpfs/DETAILS
index da49bfe..ca40281 100755
--- a/disk/mtpfs/DETAILS
+++ b/disk/mtpfs/DETAILS
@@ -1,8 +1,8 @@
SPELL=mtpfs
- VERSION=0.9
+ VERSION=1.1
SOURCE="$SPELL-$VERSION.tar.gz"
- SOURCE_URL[0]=http://www.adebenham.com/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:2db98e8375ce238ea754de51c20bddb8de88542fa5b09f8d7ddd9deee25c8e2f2f8c28af31bf6ea14db6133e7a331de8ea49b6f7ecbc248d513ebfcd7c81d5cb
+ SOURCE_URL[0]=http://www.adebenham.com/files/mtp/$SOURCE
+
SOURCE_HASH=sha512:627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}"
WEB_SITE="http://www.adebenham.com/mtpfs/";
LICENSE[0]=GPL
diff --git a/disk/mtpfs/HISTORY b/disk/mtpfs/HISTORY
index cfe3cb6..8a179d6 100644
--- a/disk/mtpfs/HISTORY
+++ b/disk/mtpfs/HISTORY
@@ -1,3 +1,6 @@
+2015-05-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 1.1, fix SOURCE_URL
+
2008-10-25 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.9, fix SOURCE_URL

diff --git a/kde4-apps/kaffeine4/HISTORY b/kde4-apps/kaffeine4/HISTORY
index 9c45180..010456d 100644
--- a/kde4-apps/kaffeine4/HISTORY
+++ b/kde4-apps/kaffeine4/HISTORY
@@ -1,3 +1,7 @@
+2015-05-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: fix build with recent gcc
+ * fix-build-gcc-4.7.patch: added
+
2011-09-06 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: xine-lib is needed to build

diff --git a/kde4-apps/kaffeine4/PRE_BUILD b/kde4-apps/kaffeine4/PRE_BUILD
new file mode 100755
index 0000000..13e6b6d
--- /dev/null
+++ b/kde4-apps/kaffeine4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SCRIPT_DIRECTORY/fix-build-gcc-4.7.patch"
diff --git a/kde4-apps/kaffeine4/fix-build-gcc-4.7.patch
b/kde4-apps/kaffeine4/fix-build-gcc-4.7.patch
new file mode 100644
index 0000000..74bc75f
--- /dev/null
+++ b/kde4-apps/kaffeine4/fix-build-gcc-4.7.patch
@@ -0,0 +1,35 @@
+From: Christoph Pfister <christophpfister AT gmail.com>
+Date: Wed, 04 Apr 2012 19:22:09 +0000
+Subject: fix build for gcc 4.7
+X-Git-Url:
http://quickgit.kde.org/?p=kaffeine.git&a=commitdiff&h=2da9df1e67004c3cfa879578c351300a99f23da1
+---
+fix build for gcc 4.7
+---
+
+
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@
+ // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
+ QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59,
45), Qt::UTC);
+
+- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount >
0) && entry.isValid();
+- --entryCount, entry.advance()) {
++ for (AtscEitSectionEntry eitEntry = eitSection.entries();
++ (entryCount > 0) && eitEntry.isValid(); --entryCount,
eitEntry.advance()) {
+ DvbEpgEntry epgEntry;
+ epgEntry.channel = channel;
+- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
+- epgEntry.duration = QTime().addSecs(entry.duration());
+- epgEntry.title = entry.title();
+-
+- quint32 id = ((quint32(fakeChannel.networkId) << 16) |
quint32(entry.eventId()));
++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
++ epgEntry.duration = QTime().addSecs(eitEntry.duration());
++ epgEntry.title = eitEntry.title();
++
++ quint32 id = ((quint32(fakeChannel.networkId) << 16) |
quint32(eitEntry.eventId()));
+ DvbSharedEpgEntry entry = epgEntries.value(id);
+
+ if (entry.isValid() && (entry->channel == epgEntry.channel) &&
+



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2ff7819857dfd3235e5ba07cd283c0dfa9007d7b), Thomas Orgis, 05/21/2015

Archive powered by MHonArc 2.6.24.

Top of Page