haubi 17/05/29 12:40:21
Modified: 001_all_nolibcheck.patch 003_all_pthread.patch
004_all_aix.patch 005_all_hpux.patch
006_all_as-needed.patch 007_all_qt4-nothread.patch
008_all_drop-pgsql-header-check.patch
009_all_check-const-overload.patch
010_all_preserve-cflags.patch
011_all_gtk-check-stdlib.patch
012_all_early-header-check.patch
014_all_idl-noresolve.patch
Log:
Have patches apply with -p1, for use with eapply in EAPI 6.
Revision Changes Path
1.3 src/patchsets/mico/2.3.13/001_all_nolibcheck.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch?r1=1.2&r2=1.3
Index: 001_all_nolibcheck.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/mico/2.3.13/001_all_nolibcheck.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 001_all_nolibcheck.patch 26 May 2011 09:12:31 -0000 1.2
+++ 001_all_nolibcheck.patch 29 May 2017 12:40:21 -0000 1.3
@@ -1,7 +1,7 @@
don't check for libbsd and libelf, they aren't needed anywhere.
---- configure.in.orig 2009-02-02 14:34:14.000000000 +0100
-+++ configure.in 2009-02-02 14:37:45.000000000 +0100
+--- mico/configure.in
++++ mico/configure.in
@@ -1237,9 +1237,7 @@
1.4 src/patchsets/mico/2.3.13/003_all_pthread.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/003_all_pthread.patch?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/003_all_pthread.patch?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/003_all_pthread.patch?r1=1.3&r2=1.4
Index: 003_all_pthread.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/003_all_pthread.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 003_all_pthread.patch 28 Jun 2011 15:02:50 -0000 1.3
+++ 003_all_pthread.patch 29 May 2017 12:40:21 -0000 1.4
@@ -2,8 +2,8 @@
compiler flag to do all pthread specific things.
http://sourceforge.net/mailarchive/forum.php?thread_name=4DDFA157.4040609%40gentoo.org&forum_name=mico-devel
---- configure.in.orig 2009-04-02 17:25:45 +0200
-+++ configure.in 2009-04-02 17:32:00 +0200
+--- mico/configure.in
++++ mico/configure.in
@@ -524,7 +524,19 @@
)
AC_CHECK_HEADERS(semaphore.h)
1.2 src/patchsets/mico/2.3.13/004_all_aix.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/004_all_aix.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/004_all_aix.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/004_all_aix.patch?r1=1.1&r2=1.2
Index: 004_all_aix.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/004_all_aix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 004_all_aix.patch 16 Aug 2010 15:07:30 -0000 1.1
+++ 004_all_aix.patch 29 May 2017 12:40:21 -0000 1.2
@@ -1,6 +1,6 @@
Do not add '-lstdc++' explicitly, this is c++ compiler's job.
---- admin/mico-shld.aix.in.orig 2009-04-02 17:33:03 +0200
-+++ admin/mico-shld.aix.in 2009-04-02 17:33:22 +0200
+--- mico/admin/mico-shld.aix.in
++++ mico/admin/mico-shld.aix.in
@@ -87,7 +87,7 @@
1.3 src/patchsets/mico/2.3.13/005_all_hpux.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/005_all_hpux.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/005_all_hpux.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/005_all_hpux.patch?r1=1.2&r2=1.3
Index: 005_all_hpux.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/mico/2.3.13/005_all_hpux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 005_all_hpux.patch 26 May 2011 09:12:31 -0000 1.2
+++ 005_all_hpux.patch 29 May 2017 12:40:21 -0000 1.3
@@ -1,7 +1,7 @@
http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
---- configure.in.orig 2009-04-02 12:53:03 +0200
-+++ configure.in 2009-04-02 15:34:10 +0200
+--- mico/configure.in
++++ mico/configure.in
@@ -732,7 +732,9 @@
# -mmillicode-long-calls
CONF_LDFLAGS=-Wl,+s
1.3 src/patchsets/mico/2.3.13/006_all_as-needed.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/006_all_as-needed.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/006_all_as-needed.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/006_all_as-needed.patch?r1=1.2&r2=1.3
Index: 006_all_as-needed.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/mico/2.3.13/006_all_as-needed.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 006_all_as-needed.patch 26 May 2011 09:09:36 -0000 1.2
+++ 006_all_as-needed.patch 29 May 2017 12:40:21 -0000 1.3
@@ -1,7 +1,7 @@
Link libmico.so against configured libraries,
to get -Wl,--as-needed working. #280678.
---- orb/Makefile.orig 2011-05-26 09:28:52.629834934 +0200
-+++ orb/Makefile 2011-05-26 09:28:59.519791273 +0200
+--- mico/orb/Makefile
++++ mico/orb/Makefile
@@ -30,7 +30,7 @@
endif
endif
1.3 src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch?r1=1.2&r2=1.3
Index: 007_all_qt4-nothread.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/mico/2.3.13/007_all_qt4-nothread.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 007_all_qt4-nothread.patch 26 May 2011 09:12:31 -0000 1.2
+++ 007_all_qt4-nothread.patch 29 May 2017 12:40:21 -0000 1.3
@@ -1,6 +1,6 @@
qt4 doesn't provide different libraries for threading.
---- configure.in.orig 2010-01-12 16:40:06.935594142 +0100
-+++ configure.in 2010-01-12 16:40:37.742311509 +0100
+--- mico/configure.in
++++ mico/configure.in
@@ -1124,7 +1124,7 @@
AC_MSG_WARN(cannot find moc. QT parts disabled.)
HAVE_QT=no
1.3
src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch?r1=1.2&r2=1.3
Index: 008_all_drop-pgsql-header-check.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/mico/2.3.13/008_all_drop-pgsql-header-check.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 008_all_drop-pgsql-header-check.patch 26 May 2011 09:12:31 -0000
1.2
+++ 008_all_drop-pgsql-header-check.patch 29 May 2017 12:40:21 -0000
1.3
@@ -1,8 +1,8 @@
http://bugs.gentoo.org/show_bug.cgi?id=306255
Result of 'checking for pgsql/libpq-fe.h' is not used anywhere, just drop it.
---- configure.in.orig 2010-02-24 10:27:45.043267799 +0100
-+++ configure.in 2010-02-24 10:28:09.016074329 +0100
+--- mico/configure.in
++++ mico/configure.in
@@ -1324,7 +1324,7 @@
AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h)
AC_CHECK_HEADERS(poll.h)
1.3
src/patchsets/mico/2.3.13/009_all_check-const-overload.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch?r1=1.2&r2=1.3
Index: 009_all_check-const-overload.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/mico/2.3.13/009_all_check-const-overload.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 009_all_check-const-overload.patch 28 Jun 2011 15:02:50 -0000 1.2
+++ 009_all_check-const-overload.patch 29 May 2017 12:40:21 -0000 1.3
@@ -3,8 +3,8 @@
http://bugs.gentoo.org/show_bug.cgi?id=365117
http://sourceforge.net/mailarchive/forum.php?thread_name=4DDFA16F.6040109%40gentoo.org&forum_name=mico-devel
---- aclocal.m4.orig 2011-05-25 14:20:01.626683873 +0200
-+++ aclocal.m4 2011-05-25 14:20:43.930773070 +0200
+--- mico/aclocal.m4
++++ mico/aclocal.m4
@@ -353,11 +353,12 @@
void bar (const int &, int &, const int *, int *, int *&);
1.2 src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch?r1=1.1&r2=1.2
Index: 010_all_preserve-cflags.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/mico/2.3.13/010_all_preserve-cflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 010_all_preserve-cflags.patch 26 May 2011 09:14:13 -0000 1.1
+++ 010_all_preserve-cflags.patch 29 May 2017 12:40:21 -0000 1.2
@@ -1,8 +1,8 @@
Do not tweak CFLAGS/CXXFLAGS for -g/-O2 if not explicitly requested
by configure arguments --*able-debug/--*able-optimize.
---- configure.in.orig 2011-05-25 16:22:01.402618836 +0200
-+++ configure.in 2011-05-25 16:27:35.022640710 +0200
+--- mico/configure.in
++++ mico/configure.in
@@ -112,12 +112,12 @@
use_repo=$enableval, use_repo=no)
1.3 src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch?r1=1.2&r2=1.3
Index: 011_all_gtk-check-stdlib.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/mico/2.3.13/011_all_gtk-check-stdlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 011_all_gtk-check-stdlib.patch 28 Jun 2011 15:03:34 -0000 1.2
+++ 011_all_gtk-check-stdlib.patch 29 May 2017 12:40:21 -0000 1.3
@@ -3,8 +3,8 @@
Also fix signed-unsigned-comparison warning.
http://sourceforge.net/mailarchive/forum.php?thread_name=4DDFA182.40903%40gentoo.org&forum_name=mico-devel
---- aclocal.m4.orig 2011-05-25 16:55:15.609086191 +0200
-+++ aclocal.m4 2011-05-25 16:55:22.999136294 +0200
+--- mico/aclocal.m4
++++ mico/aclocal.m4
@@ -765,6 +765,7 @@
AC_TRY_RUN([
#include <gtk/gtk.h>
1.2 src/patchsets/mico/2.3.13/012_all_early-header-check.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/012_all_early-header-check.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/012_all_early-header-check.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/012_all_early-header-check.patch?r1=1.1&r2=1.2
Index: 012_all_early-header-check.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/mico/2.3.13/012_all_early-header-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 012_all_early-header-check.patch 26 May 2011 09:17:03 -0000 1.1
+++ 012_all_early-header-check.patch 29 May 2017 12:40:21 -0000 1.2
@@ -2,8 +2,8 @@
run due to some condition, EGREP is unset for subsequent checks.
This breaks the checks for function prototypes.
---- configure.in.orig 2011-05-26 07:49:07.047082532 +0200
-+++ configure.in 2011-05-26 07:52:48.130834617 +0200
+--- mico/configure.in
++++ mico/configure.in
@@ -411,6 +411,8 @@
AC_SUBST(EXTRA_CXXFLAGS)
ac_compile="$ac_compile "'$EXTRA_CXXFLAGS'
1.2 src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch?r1=1.1&r2=1.2
Index: 014_all_idl-noresolve.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/mico/2.3.13/014_all_idl-noresolve.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 014_all_idl-noresolve.patch 24 Sep 2012 20:32:16 -0000 1.1
+++ 014_all_idl-noresolve.patch 29 May 2017 12:40:21 -0000 1.2
@@ -1,5 +1,5 @@
---- idl/main.cc.orig 2011-11-25 23:50:09.767034055 +0100
-+++ idl/main.cc 2011-11-25 23:52:43.149752575 +0100
+--- mico/idl/main.cc
++++ mico/idl/main.cc
@@ -82,6 +82,13 @@
DB db;
@@ -14,8 +14,8 @@
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
#ifdef _WIN32
---- orb/address.cc.orig 2011-11-25 23:39:06.523042175 +0100
-+++ orb/address.cc 2011-11-25 23:52:43.149752575 +0100
+--- mico/orb/address.cc
++++ mico/orb/address.cc
@@ -635,8 +635,12 @@
{
if (hname.length() == 0) {
