Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 3678 - vlc-0.4.0 (UPDATE) with 1.3b
Summary: vlc-0.4.0 (UPDATE) with 1.3b
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: x86 Linux
: High normal (vote)
Assignee: Seemant Kulleen (RETIRED)
URL:
Whiteboard:
Keywords:
: 3635 (view as bug list)
Depends on:
Blocks:
 
Reported: 2002-06-12 22:49 UTC by Markus Mohr
Modified: 2003-02-04 19:42 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Markus Mohr 2002-06-12 22:49:47 UTC
The original vlc-0.4.0 package was not satisfying because of two reasons:
1. the dependencies required me to install qt-2.3 although qt-3 alreaddy had
been installed
2. after changing the dependencies the source did not compile

So, here are two patches (first for the ebuild script and second for  the vlc
sources)

1st

--- vlc-0.4.0.ebuild    Thu Jun 13 05:45:25 2002
+++ /usr/portage/media-video/vlc/vlc-0.4.0.ebuild       Thu Jun 13 03:46:10 2002
@@ -10,5 +10,5 @@
 
 DEPEND="X? ( virtual/x11 )
-       qt? ( =x11-libs/qt-2.3* )
+       qt? ( =x11-libs/qt-3* )
        dvd? ( media-libs/libdvdread
                media-libs/libdvdcss )


2nd


diff -cr -U2 vlc-0.4.0/configure.in vlc-0.4.0b/configure.in
--- vlc-0.4.0/configure.in      Thu May 23 01:47:11 2002
+++ vlc-0.4.0b/configure.in     Thu Jun 13 03:20:29 2002
@@ -1405,5 +1405,5 @@
      PLUGINS="${PLUGINS} kde"
      ALIASES="${ALIASES} kvlc"
-     kde_LDFLAGS="${kde_LDFLAGS} -L${KDEDIR}/lib -lkfile"
+     kde_LDFLAGS="${kde_LDFLAGS} -L${KDEDIR}/lib"
      kde_CFLAGS="${kde_CFLAGS} -I/usr/include/kde -I/usr/include/qt"
      kde_CFLAGS="${kde_CFLAGS} -I${KDEDIR}/include -I${QTDIR}/include"
diff -cr -U2 vlc-0.4.0/plugins/kde/kde_interface.h
vlc-0.4.0b/plugins/kde/kde_interface.h
--- vlc-0.4.0/plugins/kde/kde_interface.h       Thu May 23 01:47:11 2002
+++ vlc-0.4.0b/plugins/kde/kde_interface.h      Thu Jun 13 03:17:27 2002
@@ -13,4 +13,5 @@
 
 #include <kmainwindow.h>
+#include <kstatusbar.h>
 #include <kapplication.h>
 #include <kurl.h>
diff -cr -U2 vlc-0.4.0/plugins/kde/kde_preferences.cpp
vlc-0.4.0b/plugins/kde/kde_preferences.cp
p
--- vlc-0.4.0/plugins/kde/kde_preferences.cpp   Thu May 23 01:47:11 2002
+++ vlc-0.4.0b/plugins/kde/kde_preferences.cpp  Thu Jun 13 03:17:27 2002
@@ -30,5 +30,5 @@
                            const QString &caption) :
     KDialogBase ( Tabbed, caption, Ok| Apply|Cancel|User1, Ok, parent,
-                  "vlc preferences", true, false, "Save")
+                  "vlc preferences", true, false, (KGuiItem)"Save")
 {
     module_t *p_module, *p_module_bis;
Comment 1 Seemant Kulleen (RETIRED) gentoo-dev 2002-06-13 05:52:57 UTC
Markus,

Does this work ok with qt3 then, with your changes?
Comment 2 Seemant Kulleen (RETIRED) gentoo-dev 2002-06-17 22:46:51 UTC
Thanks Markus, added to portage.
Comment 3 Seemant Kulleen (RETIRED) gentoo-dev 2002-06-18 10:16:38 UTC
*** Bug 3635 has been marked as a duplicate of this bug. ***