Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (e5c1b24dcf79df5d5a2a2f01631c7522c2b756df)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (e5c1b24dcf79df5d5a2a2f01631c7522c2b756df)
  • Date: Tue, 26 May 2015 14:34:53 -0500

GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

video/vlc/BUILD | 3 ---
video/vlc/HISTORY | 4 ++++
video/vlc/PRE_BUILD | 6 ------
3 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit e5c1b24dcf79df5d5a2a2f01631c7522c2b756df
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

vlc - fix build with qt4 in /opt

diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index fcc07ff..ecbecdf 100755
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -26,7 +26,4 @@ fi &&
if is_depends_enabled $SPELL goom; then
LDFLAGS=${LDFLAGS/-Wl,--as-needed}
fi &&
-if is_depends_enabled $SPELL qt4; then
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" PATH="$QTDIR/bin/qt4:$PATH"
-fi &&
default_build
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 2a51551..08a08d7 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,7 @@
+2015-05-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, BUILD: fix for qt4
+ * configure-qt.patch: deleted
+
2015-05-18 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD, BUILD, DEPENDS: fix for qt5

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 1809c16..02c2ea1 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,12 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-if is_depends_enabled $SPELL qt4; then
- message "${MESSAGE_COLOR}Patching configure for QT paths.$DEFAULT_COLOR" &&
- patch -p0 < "$SCRIPT_DIRECTORY/configure-qt.patch" &&
- autoreconf
-fi &&
-
MOZ_MAKEFILE="projects/mozilla/Makefile.in" &&
if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
sedit 's:$(libdir)/mozilla:$(libdir)/firefox:' $MOZ_MAKEFILE



  • [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (e5c1b24dcf79df5d5a2a2f01631c7522c2b756df), Treeve Jelbert, 05/26/2015

Archive powered by MHonArc 2.6.24.

Top of Page