diff options
Diffstat (limited to 'app-editors/mp/files/mp-5.1.1-asneeded.patch')
| -rw-r--r-- | app-editors/mp/files/mp-5.1.1-asneeded.patch | 245 |
1 files changed, 245 insertions, 0 deletions
diff --git a/app-editors/mp/files/mp-5.1.1-asneeded.patch b/app-editors/mp/files/mp-5.1.1-asneeded.patch new file mode 100644 index 000000000000..6135ddd0bbbf --- /dev/null +++ b/app-editors/mp/files/mp-5.1.1-asneeded.patch @@ -0,0 +1,245 @@ +Index: mp-5.1.1/config.sh +=================================================================== +--- mp-5.1.1.orig/config.sh ++++ mp-5.1.1/config.sh +@@ -75,7 +75,7 @@ echo "Configuring..." + + echo "/* automatically created by config.sh - do not modify */" > config.h + echo "# automatically created by config.sh - do not modify" > makefile.opts +-> config.ldflags ++> config.libs + > config.cflags + > .config.log + +@@ -129,7 +129,7 @@ done + + if [ "$MPDM" != "NOTFOUND" ] ; then + echo "-I$MPDM" >> config.cflags +- echo "-L$MPDM -lmpdm" >> config.ldflags ++ echo "-L$MPDM -lmpdm" >> config.libs + echo "OK ($MPDM)" + else + echo "No" +@@ -141,7 +141,7 @@ if [ ! -f $MPDM/Makefile ] ; then + ( echo ; cd $MPDM ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo ) + fi + +-cat $MPDM/config.ldflags >> config.ldflags ++cat $MPDM/config.libs >> config.libs + echo "MPDM=$MPDM" >> makefile.opts + + # MPSL +@@ -155,7 +155,7 @@ done + + if [ "$MPSL" != "NOTFOUND" ] ; then + echo "-I$MPSL" >> config.cflags +- echo "-L$MPSL -lmpsl" >> config.ldflags ++ echo "-L$MPSL -lmpsl" >> config.libs + echo "OK ($MPSL)" + else + echo "No" +@@ -167,7 +167,7 @@ if [ ! -f $MPSL/Makefile ] ; then + ( echo ; cd $MPSL ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo ) + fi + +-cat $MPSL/config.ldflags >> config.ldflags ++cat $MPSL/config.libs >> config.libs + echo "MPSL=$MPSL" >> makefile.opts + + # Win32 +@@ -179,7 +179,7 @@ else + grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null + + if [ $? = 0 ] ; then +- echo "-mwindows -lcomctl32" >> config.ldflags ++ echo "-mwindows -lcomctl32" >> config.libs + echo "#define CONFOPT_WIN32 1" >> config.h + echo "OK" + DRIVERS="win32 $DRIVERS" +@@ -210,7 +210,7 @@ else + if [ $? = 0 ] ; then + echo "#define CONFOPT_CURSES 1" >> config.h + echo $TMP_CFLAGS >> config.cflags +- echo $TMP_LDFLAGS >> config.ldflags ++ echo $TMP_LDFLAGS >> config.libs + echo "OK (ncursesw)" + DRIVERS="ncursesw $DRIVERS" + DRV_OBJS="mpv_curses.o $DRV_OBJS" +@@ -263,7 +263,7 @@ else + TMP_CFLAGS="$TMP_CFLAGS -I`kde4-config --install include`KDE" + + TMP_LDFLAGS=$(pkg-config --libs QtCore) +- TMP_LDFLAGS="$TMP_LDFLAGS -L`kde4-config --install lib` -lkfile -lkdeui -lkdecore" ++ TMP_LDFLAGS="$TMP_LDFLAGS -L`kde4-config --install lib` -lkfile -lkdeui -lkdecore -lkio" + + echo "#include <KApplication>" > .tmp.cpp + echo "int main(void) { new KApplication() ; return 0; } " >> .tmp.cpp +@@ -273,7 +273,7 @@ else + + if [ $? = 0 ] ; then + echo $TMP_CFLAGS >> config.cflags +- echo $TMP_LDFLAGS >> config.ldflags ++ echo $TMP_LDFLAGS >> config.libs + + echo "#define CONFOPT_KDE4 1" >> config.h + echo "OK" +@@ -311,7 +311,7 @@ else + if [ $? = 0 ] ; then + echo "#define CONFOPT_GTK 2" >> config.h + echo "$TMP_CFLAGS " >> config.cflags +- echo "$TMP_LDFLAGS " >> config.ldflags ++ echo "$TMP_LDFLAGS " >> config.libs + echo "OK (2.0)" + DRIVERS="gtk $DRIVERS" + DRV_OBJS="mpv_gtk.o $DRV_OBJS" +Index: mp-5.1.1/makefile.in +=================================================================== +--- mp-5.1.1.orig/makefile.in ++++ mp-5.1.1/makefile.in +@@ -35,7 +35,7 @@ dep: + gcc -MM *.c `cat config.cflags` > makefile.depend + + $(APPNAME): $(OBJS) $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a +- $(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` -o $@ ++ $(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` `cat config.libs` -o $@ + + mpv_kde4.o: mpv_kde4.cpp mpv_kde4.moc + $(CPP) $(CFLAGS) -I. `cat config.cflags` -c $< +@@ -47,7 +47,7 @@ mp_res.o: mp_res.rc + $(WINDRES) mp_res.rc mp_res.o + + wmp.exe: $(OBJS) mp_res.o $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a +- $(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` -o $@ ++ $(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` `cat config.libs` -o $@ + + clean: + rm -f $(APPNAME) $(LIB) $(OBJS) *.o *.moc tags *.tar.gz *.exe *.zip .installer.c *.1 +@@ -55,7 +55,7 @@ clean: + (cd $(MPSL) ; make clean) + + distclean: clean +- rm -f config.h config.cflags config.ldflags \ ++ rm -f config.h config.cflags config.ldflags config.libs \ + makefile.opts Makefile po/minimum-profit.pot + + docsclean: +Index: mp-5.1.1/mpdm/config.sh +=================================================================== +--- mp-5.1.1.orig/mpdm/config.sh ++++ mp-5.1.1/mpdm/config.sh +@@ -70,7 +70,7 @@ echo "Configuring MPDM..." + + echo "/* automatically created by config.sh - do not modify */" > config.h + echo "# automatically created by config.sh - do not modify" > makefile.opts +-> config.ldflags ++> config.libs + > config.cflags + > .config.log + +@@ -169,7 +169,7 @@ if [ "$WITH_PCRE" = 1 ] ; then + echo "OK (using pcre library)" + echo "#define CONFOPT_PCRE 1" >> config.h + echo "$TMP_CFLAGS " >> config.cflags +- echo "$TMP_LDFLAGS " >> config.ldflags ++ echo "$TMP_LDFLAGS " >> config.libs + REGEX_YET=1 + fi + fi +@@ -316,7 +316,7 @@ else + if [ $? = 0 ] ; then + echo "OK (libintl needed)" + echo "#define CONFOPT_GETTEXT 1" >> config.h +- echo "$TMP_LDFLAGS" >> config.ldflags ++ echo "$TMP_LDFLAGS" >> config.libs + else + echo "No" + fi +@@ -349,7 +349,7 @@ else + if [ $? = 0 ] ; then + echo "OK (libiconv needed)" + echo "#define CONFOPT_ICONV 1" >> config.h +- echo "$TMP_LDFLAGS" >> config.ldflags ++ echo "$TMP_LDFLAGS" >> config.libs + else + echo "No" + fi +Index: mp-5.1.1/mpdm/makefile.in +=================================================================== +--- mp-5.1.1.orig/mpdm/makefile.in ++++ mp-5.1.1/mpdm/makefile.in +@@ -32,7 +32,7 @@ $(LIB): $(OBJS) + $(AR) rv $(LIB) $(OBJS) + + stress: stress.c $(LIB) +- $(CC) $(CFLAGS) `cat config.ldflags` stress.c -L. -lmpdm -o $@ ++ $(CC) $(CFLAGS) `cat config.ldflags` `cat config.libs` stress.c -L. -lmpdm -o $@ + + .SUFFIXES: .txt .html + +@@ -54,7 +54,7 @@ clean: + rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress + + distclean: clean +- rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile ++ rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile + + realclean: distclean docsclean + +Index: mp-5.1.1/mpsl/config.sh +=================================================================== +--- mp-5.1.1.orig/mpsl/config.sh ++++ mp-5.1.1/mpsl/config.sh +@@ -69,7 +69,7 @@ echo "Configuring MPSL..." + + echo "/* automatically created by config.sh - do not modify */" > config.h + echo "# automatically created by config.sh - do not modify" > makefile.opts +-> config.ldflags ++> config.libs + > config.cflags + > .config.log + +@@ -131,7 +131,7 @@ done + + if [ "$MPDM" != "NOTFOUND" ] ; then + echo "-I$MPDM" >> config.cflags +- echo "-L$MPDM -lmpdm" >> config.ldflags ++ echo "-L$MPDM -lmpdm" >> config.libs + echo "OK ($MPDM)" + else + echo "No" +@@ -143,7 +143,7 @@ if [ ! -f $MPDM/Makefile ] ; then + ( echo ; cd $MPDM ; ./config.sh $CONF_ARGS ; echo ) + fi + +-cat $MPDM/config.ldflags >> config.ldflags ++cat $MPDM/config.libs >> config.libs + + # if win32, the interpreter is called mpsl.exe + grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null && TARGET=mpsl.exe +Index: mp-5.1.1/mpsl/makefile.in +=================================================================== +--- mp-5.1.1.orig/mpsl/makefile.in ++++ mp-5.1.1/mpsl/makefile.in +@@ -49,11 +49,11 @@ $(LIB): $(OBJS) + $(AR) rv $(LIB) $(OBJS) + + $(TARGET): $(LIB) $(MPDM)/libmpdm.a +- $(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` -o $@ ++ $(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@ + + stress: stress.c $(LIB) $(MPDM)/libmpdm.a + $(CC) $(CFLAGS) `cat config.cflags` stress.c \ +- -L. -lmpsl `cat config.ldflags` -o $@ ++ -L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@ + + clean: + rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress +@@ -62,7 +62,7 @@ realclean: clean + rm -f y.tab.c y.tab.h lex.yy.c + + distclean: clean y.tab.c y.tab.h lex.yy.c +- rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile ++ rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile + + realclean: distclean docsclean + |