Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b27a04c0a98f887245ae5618170f9c51f5081254)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (b27a04c0a98f887245ae5618170f9c51f5081254)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b27a04c0a98f887245ae5618170f9c51f5081254)
  • Date: Tue, 1 Jan 2019 17:18:14 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

gnome2-libs/librsvg2/DETAILS | 4 +-
gnome2-libs/librsvg2/HISTORY | 3 ++
qt5-cmake/drumstick/DETAILS | 4 +-
qt5-cmake/drumstick/HISTORY | 4 ++
qt5-cmake/drumstick/PRE_BUILD | 1
qt5-cmake/drumstick/gcc6.patch | 38 --------------------------
utils/youtube-dl/DETAILS | 2 -
utils/youtube-dl/HISTORY | 3 ++
x11/colord/BUILD | 4 ++
x11/colord/DEPENDS | 58
++++++++++++++++++-----------------------
x11/colord/HISTORY | 3 ++
x11/colord/INSTALL | 3 +-
12 files changed, 49 insertions(+), 78 deletions(-)

New commits:
commit b27a04c0a98f887245ae5618170f9c51f5081254
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/colord: fix dependencies and installation

commit 32018ea018cddf732c1a570388131622a964dcea
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnome2-libs/librsvg2: version 2.44.11

commit e44b9babdfe9cf2c8b41a6a5e3bfc6e924a41ec3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/youtube-dl: version 2018.12.31

commit 96916e747a1bc56dcc50309da238a6ccac2421ce
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

qt5-cmake/drumstick: version 1.1.0

diff --git a/gnome2-libs/librsvg2/DETAILS b/gnome2-libs/librsvg2/DETAILS
index 41f8959..3c5aca6 100755
--- a/gnome2-libs/librsvg2/DETAILS
+++ b/gnome2-libs/librsvg2/DETAILS
@@ -1,6 +1,6 @@
SPELL=librsvg2
- VERSION=2.44.10
-
SOURCE_HASH=sha512:72a731cff54a26edbbdb599b48d4595976530175d885d8e160d7b269b3ec8d285a9dae56f03b4c89a4df6170487d12538d1708b7585358ec2806707f2fbfaced
+ VERSION=2.44.11
+
SOURCE_HASH=sha512:a5f0d08d35e0732558cc485b99cbaa9e7a4d539f79891dcdb2722edb37ac906b16653e34bf3406afe6d5439fe1e9a7842dbc37e6750df9b7221557bfbd12cda1
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SECURITY_PATCH=2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index a5aca10..cf52f60 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,6 @@
+2019-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: 2.44.10
+
2018-12-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: 2.44.10

diff --git a/qt5-cmake/drumstick/DETAILS b/qt5-cmake/drumstick/DETAILS
index d638ecb..a8476d2 100755
--- a/qt5-cmake/drumstick/DETAILS
+++ b/qt5-cmake/drumstick/DETAILS
@@ -1,6 +1,6 @@
SPELL=drumstick
- VERSION=1.0.2
-
SOURCE_HASH=sha512:df8d36b58e83b1e06cd1e4788e63c504bf2282c26f505509b2125e6c7be8ce8bc013774755b68e36f372a8682328459a5efb67ff09be1e0190805528458b3e45
+ VERSION=1.1.0
+
SOURCE_HASH=sha512:1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://sourceforge.net/projects/drumstick/files/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/qt5-cmake/drumstick/HISTORY b/qt5-cmake/drumstick/HISTORY
index 111a5e0..7c978e5 100644
--- a/qt5-cmake/drumstick/HISTORY
+++ b/qt5-cmake/drumstick/HISTORY
@@ -1,3 +1,7 @@
+2018-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1.0
+ * PRE_BUILD, gcc6.patch: remove obsolete patch
+
2016-05-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.2
* gcc6.patch: added
diff --git a/qt5-cmake/drumstick/PRE_BUILD b/qt5-cmake/drumstick/PRE_BUILD
index a27a7bb..36070cc 100755
--- a/qt5-cmake/drumstick/PRE_BUILD
+++ b/qt5-cmake/drumstick/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 <$SPELL_DIRECTORY/gcc6.patch &&
sed -i '/update_xdg_mimetypes/D;/LIB_SUFFIX/s/64//' CMakeLists.txt
diff --git a/qt5-cmake/drumstick/gcc6.patch b/qt5-cmake/drumstick/gcc6.patch
deleted file mode 100644
index ca46523..0000000
--- a/qt5-cmake/drumstick/gcc6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: library/file/qove.cpp
-===================================================================
---- a/library/file/qove.cpp (revision 316)
-+++ b/library/file/qove.cpp (working copy)
-@@ -11356,7 +11356,7 @@
- OVE::MeasureData* measureData =
d->ove.getMeasureData(i, j, k);
- QList<OVE::MusicData*> tempoPtrs =
measureData->getMusicDatas(OVE::MusicData_Tempo);
-
-- if (k == 0 || (k > 0 &&
abs(measure->getTypeTempo() - d->ove.getMeasure(k - 1)->getTypeTempo()) >
0.01)) {
-+ if (k == 0 || (k > 0 &&
std::abs(measure->getTypeTempo() - d->ove.getMeasure(k -
1)->getTypeTempo()) > 0.01)) {
- int tick = d->mtt.getTick(k, 0);
- int tempo = (int)
measure->getTypeTempo();
- tempos[tick] = tempo;
-@@ -11739,7 +11739,7 @@
- }
- case OVE::Articulation_Arpeggio: {
- //if( art->getChangeSoundEffect() ) {
-- unsigned int soundEffect =
abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second);
-+ unsigned int soundEffect =
std::abs(art->getSoundEffect().first) +
std::abs(art->getSoundEffect().second);
- int tickAmount = (soundEffect
/ notes.size()) * ((notes.size() - i) - 1);
- startTick -= tickAmount;
- //}
-Index: utils/testevents/testevents.cpp
-===================================================================
---- a/utils/testevents/testevents.cpp (revision 316)
-+++ b/utils/testevents/testevents.cpp (working copy)
-@@ -262,7 +262,7 @@
- dumpEvent(new KeyPressEvent(5, 60, 124));
- dumpEvent(new ChanPressEvent(6, 111));
- dumpEvent(new PitchBendEvent(7, 1234));
-- char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41,
0xf7};
-+ char sysex[] = {'\xf0', '\x41', '\x10', '\x42', '\x12', '\x40', '\0',
'\x7f', '\0', '\x41', '\xf7'};
- dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
- QString text = "This can be a copyright, song name, instrument,
lyric...";
- TextEvent te(text, 3);
---
-cgit v0.12
-
diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index a13f8b6..39045cb 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,5 +1,5 @@
SPELL=youtube-dl
- VERSION=2018.12.17
+ VERSION=2018.12.31
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index bdf68d3..9ccb6d1 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2019-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2018.12.31
+
2018-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2018.12.17

diff --git a/x11/colord/BUILD b/x11/colord/BUILD
index 6d39fae..09fa6e8 100755
--- a/x11/colord/BUILD
+++ b/x11/colord/BUILD
@@ -1 +1,3 @@
-. "${GRIMOIRE}/MESON_FUNCTIONS"
+OPTS="$OPTS -Dlibcolordcompat=true" &&
+meson build --prefix=$INSTALL_ROOT/usr $OPTS &&
+ninja -C build
diff --git a/x11/colord/DEPENDS b/x11/colord/DEPENDS
index 777059a..7b348ba 100755
--- a/x11/colord/DEPENDS
+++ b/x11/colord/DEPENDS
@@ -1,41 +1,35 @@
-depends dbus &&
-depends glib2 &&
-depends intltool &&
-depends lcms2 &&
-depends sqlite &&
-depends libgudev &&
-depends meson &&
+depends dbus &&
+depends docbook-utils &&
+depends glib2 &&
+depends intltool &&
+depends lcms2 &&
+depends libgudev &&
+depends libgusb &&
+depends meson &&
+depends policykit &&
+depends sqlite &&

-optional_depends gettext \
- '--enable-nls' \
- '--disable-nls' \
- 'NLS support' &&
+optional_depends bash \
+ '-Dbash=true' \
+ '-Dbash=false' \
+ 'install bash completion' &&

-optional_depends libgusb \
- '--enable-gusb' \
- '--disable-gusb' 'USB support' &&
+optional_depends vala \
+ '-Dvapi=true' \
+ '-Dvapi=false' \
+ 'build vala bindings' &&

optional_depends argyllcms \
- '--enable-argyllcms-sensor' \
- '--disable-argyllcms-sensor' \
- 'ArgllCMS sensor ' &&
+ '-Dargyllcms_sensor=true' \
+ '-Dargyllcms_sensor=false' \
+ 'ArgllCMS sensor' &&

optional_depends systemd \
- '--enable-systemd-login' \
- '--disable-systemd-login' \
+ '-Dsystemd=true' \
+ '-Dsystemd=false' \
'SystemD support' &&

-optional_depends policykit \
- "--enable-polkit" \
- "--disable-polkit" \
- "for policykit support" &&
-
optional_depends sane-backends \
- "--enable-sane" \
- "--disable-sane" \
- "for scanner support" &&
-
-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "to build documentation"
+ "-Dsane=true" \
+ "-Dsane=false" \
+ "for scanner support"
diff --git a/x11/colord/HISTORY b/x11/colord/HISTORY
index 3c67dd8..377af9e 100644
--- a/x11/colord/HISTORY
+++ b/x11/colord/HISTORY
@@ -1,3 +1,6 @@
+2018-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, INSTALL: fix dependencies and installation
+
2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.4.3
* BUILD, CONFIGURE, INSTALL, DEPENDS: use meson
diff --git a/x11/colord/INSTALL b/x11/colord/INSTALL
index 6d39fae..dce29c4 100755
--- a/x11/colord/INSTALL
+++ b/x11/colord/INSTALL
@@ -1 +1,2 @@
-. "${GRIMOIRE}/MESON_FUNCTIONS"
+cd build &&
+ninja install


  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b27a04c0a98f887245ae5618170f9c51f5081254), Florian Franzmann, 01/01/2019

Archive powered by MHonArc 2.6.24.

Top of Page