* [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: gentoo-3.1.1.diff
@ 2009-09-03 15:29 Andreas Proschofsky (suka)
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Proschofsky (suka) @ 2009-09-03 15:29 UTC (permalink / raw
To: gentoo-commits
suka 09/09/03 15:29:16
Modified: gentoo-3.1.1.diff
Log:
Fix qt4-detection, see bug #280344
(Portage version: 2.2_rc40/cvs/Linux i686)
Revision Changes Path
1.2 app-office/openoffice/files/gentoo-3.1.1.diff
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?r1=1.1&r2=1.2
Index: gentoo-3.1.1.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gentoo-3.1.1.diff 2 Sep 2009 19:07:24 -0000 1.1
+++ gentoo-3.1.1.diff 3 Sep 2009 15:29:16 -0000 1.2
@@ -11,4 +11,15 @@
[ LinuxOnly ]
# fix that allows OOo to work with a standard (unpatched) libjpeg,
+--- patches/dev300kde4-configure.diff
++++ patches/dev300/kde4-configure.diff
+@@ -104,7 +104,7 @@
+ +MOC4="moc"
+ +if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
+ + qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+-+ qt_libdirs="$QTLIB /usr/lib $x_libraries"
+++ qt_libdirs="$QTLIB /usr/lib /usr/lib/qt4 $x_libraries"
+ +
+ + kde_incdirs="/usr/include $x_includes"
+ + kde_libdirs="/usr/lib $x_libraries"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: gentoo-3.1.1.diff
@ 2009-10-28 11:53 Andreas Proschofsky (suka)
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Proschofsky (suka) @ 2009-10-28 11:53 UTC (permalink / raw
To: gentoo-commits
suka 09/10/28 11:53:25
Modified: gentoo-3.1.1.diff
Log:
Bump to ooo-build-3.1.1.4, also re-fix kde4/qt4-support
(Portage version: 2.2_rc46/cvs/Linux i686)
Revision Changes Path
1.5 app-office/openoffice/files/gentoo-3.1.1.diff
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?r1=1.4&r2=1.5
Index: gentoo-3.1.1.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gentoo-3.1.1.diff 22 Sep 2009 13:01:27 -0000 1.4
+++ gentoo-3.1.1.diff 28 Oct 2009 11:53:25 -0000 1.5
@@ -11,34 +11,15 @@
[ LinuxOnly ]
# fix that allows OOo to work with a standard (unpatched) libjpeg,
---- patches/dev300/system-db-check.diff
-+++ patches/dev300/system-db-check.diff
-@@ -12,14 +12,16 @@
- - [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ )
- - ], []
- - )
--+ for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
-+- AC_MSG_CHECKING([whether db is at least 4.1])
-+- for v in `seq 1 7`; do
-++ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
- + AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
- + done
- + if test "$DB_INCLUDES" = ""; then
- + AC_MSG_ERROR(no. install the db4-dev package)
- + fi
-- AC_MSG_CHECKING([whether db is at least 4.1])
-- for v in 1 2 3 4 5; do
-++ AC_MSG_CHECKING([whether db is at least 4.1])
-++ for v in `seq 1 8`; do
- AC_TRY_RUN([
- @@ -3302,12 +3300,13 @@
- else
-@@ -32,7 +34,7 @@
- - [AC_MSG_ERROR([db not installed or functional])], [])
- - SCPDEFS="$SCPDEFS -DSYSTEM_DB"
- + save_LIBS="$LIBS"
--+ for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
-++ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
- + AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
- + done
- + AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
+--- patches/dev300/kde4-configure2.diff
++++ patches/dev300/kde4-configure2.diff
+@@ -7,7 +7,7 @@
+ - qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+ - qt_libdirs="$QTLIB /usr/lib $x_libraries"
+ + qt_incdirs="$QT4INC $QT4DIR $QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+-+ qt_libdirs="$QT4LIB $QTLIB /usr/lib $x_libraries"
+++ qt_libdirs="$QT4LIB $QTLIB /usr/lib/qt4 /usr/lib $x_libraries"
+
+ kde_incdirs="/usr/include $x_includes"
+ kde_libdirs="/usr/lib $x_libraries"
+
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: gentoo-3.1.1.diff
@ 2009-10-29 11:43 Andreas Proschofsky (suka)
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Proschofsky (suka) @ 2009-10-29 11:43 UTC (permalink / raw
To: gentoo-commits
suka 09/10/29 11:43:24
Modified: gentoo-3.1.1.diff
Log:
Accidentaly dropped db-4.8 fix, re-introduce
(Portage version: 2.2_rc46/cvs/Linux i686)
Revision Changes Path
1.6 app-office/openoffice/files/gentoo-3.1.1.diff
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?r1=1.5&r2=1.6
Index: gentoo-3.1.1.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gentoo-3.1.1.diff 28 Oct 2009 11:53:25 -0000 1.5
+++ gentoo-3.1.1.diff 29 Oct 2009 11:43:23 -0000 1.6
@@ -22,4 +22,24 @@
kde_incdirs="/usr/include $x_includes"
kde_libdirs="/usr/lib $x_libraries"
+--- patches/dev300/system-db-check.diff
++++ patches/dev300/system-db-check.diff
+@@ -12,7 +12,7 @@
+ - [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ )
+ - ], []
+ - )
+-+ for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+++ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+ + AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
+ + done
+ + if test "$DB_INCLUDES" = ""; then
+@@ -32,7 +32,7 @@
+ - [AC_MSG_ERROR([db not installed or functional])], [])
+ - SCPDEFS="$SCPDEFS -DSYSTEM_DB"
+ + save_LIBS="$LIBS"
+-+ for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+++ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+ + AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
+ + done
+ + AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-10-29 11:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-28 11:53 [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: gentoo-3.1.1.diff Andreas Proschofsky (suka)
-- strict thread matches above, loose matches on Subject: below --
2009-10-29 11:43 Andreas Proschofsky (suka)
2009-09-03 15:29 Andreas Proschofsky (suka)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox