sync patches (linenumbers)

This commit is contained in:
pvalchev 2003-03-02 22:07:48 +00:00
parent 893484bf10
commit 475ad35ecf
2 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.6 2003/01/27 19:53:58 espie Exp $
--- configure.in.orig Mon Nov 25 04:55:41 2002
+++ configure.in Fri Jan 3 03:18:23 2003
$OpenBSD: patch-configure_in,v 1.7 2003/03/02 22:07:48 pvalchev Exp $
--- configure.in.orig Thu Jan 16 12:48:40 2003
+++ configure.in Sat Mar 1 09:14:26 2003
@@ -36,7 +36,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.6 2003/01/27 19:53:58 espie Exp $
KDE_SET_PREFIX
@@ -1548,7 +1548,7 @@ dnl else
@@ -1549,7 +1549,7 @@ dnl else
dnl lib_xaw_opt=-lXaw
dnl fi
EXTRATDEFS="$EXTRATDEFS -DIA_XAW"
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.6 2003/01/27 19:53:58 espie Exp $
dnl if test "x$have_xext" = xyes; then
dnl a_so_libs="-lXext -lX11"
dnl else
@@ -1893,6 +1893,9 @@ case "$OS_TYPE" in
@@ -1894,6 +1894,9 @@ case "$OS_TYPE" in
NetBSD)
kde_mpeglib_compiles=yes
;;
@ -29,7 +29,7 @@ $OpenBSD: patch-configure_in,v 1.6 2003/01/27 19:53:58 espie Exp $
Linux)
kde_mpeglib_compiles=yes
;;
@@ -1922,6 +1925,12 @@ case "$OS_TYPE" in
@@ -1923,6 +1926,12 @@ case "$OS_TYPE" in
AC_DEFINE(OS_Linux,1,[Define if you have linux pthread])
;;
@ -42,7 +42,7 @@ $OpenBSD: patch-configure_in,v 1.6 2003/01/27 19:53:58 espie Exp $
FreeBSD)
OS_TYPE="BSD"
AC_CHECK_LIB(c_r, pthread_create, [LIBPTHREAD="-lc_r"]) dnl name of pthread lib in FreeBSD
@@ -1968,7 +1977,7 @@ KDE_MPEGLIB_COMPILES
@@ -1969,7 +1978,7 @@ KDE_MPEGLIB_COMPILES
THIS_LIB_LIBS="-lX11 -lXext -lm -lstdc++ ${XVLIBS} ${DGALIBS} "
THIS_LIB_LIBS="${THIS_LIB_LIBS} ${XVIDMODELIBS} ${SDLLIB} ${CDDALIBS} "

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-kscd_Makefile_in,v 1.3 2003/01/27 19:53:58 espie Exp $
--- kscd/Makefile.in.orig Mon Nov 25 04:56:42 2002
+++ kscd/Makefile.in Wed Jan 1 16:18:39 2003
$OpenBSD: patch-kscd_Makefile_in,v 1.4 2003/03/02 22:07:48 pvalchev Exp $
--- kscd/Makefile.in.orig Thu Jan 16 12:49:40 2003
+++ kscd/Makefile.in Sat Mar 1 09:16:19 2003
@@ -333,7 +333,7 @@ appsdir = $(kde_appsdir)/Multimedia
CDDBDIR = $(kde_datadir)/kscd/cddb/
@ -19,7 +19,7 @@ $OpenBSD: patch-kscd_Makefile_in,v 1.3 2003/01/27 19:53:58 espie Exp $
#SOURCES3=kscdmagic/bitmap.cpp kscdmagic/core.cpp kscdmagic/main.cpp
# kscdmagic/sound.cpp kscdmagic/xlibwrap.cpp kscdmagic/xlib.c
@@ -425,7 +425,7 @@ kscd_nofinal_OBJECTS = kscd.$(OBJEXT) co
@@ -421,7 +421,7 @@ kscd_nofinal_OBJECTS = kscd.$(OBJEXT) co
mgconfdlg.$(OBJEXT) bwlednum.$(OBJEXT) configWidget.$(OBJEXT) kscd_skel.$(OBJEXT)
@KDE_USE_FINAL_FALSE@kscd_OBJECTS = $(kscd_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE@kscd_OBJECTS = $(kscd_final_OBJECTS)