diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-30 16:00:34 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-30 16:00:34 +0100 |
commit | 8b63b46fda85d54cfbe94df2444a3ddd3e63b8e4 (patch) | |
tree | ced0310e563ec21deb23ca12d5459aebadba36f6 /dev-libs/Ice/files | |
parent | 93c735f5f1ff867aadcc947348d984ff2c5a29cb (diff) |
gentoo auto-resync : 30:03:2023 - 16:00:34
Diffstat (limited to 'dev-libs/Ice/files')
-rw-r--r-- | dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch | 50 | ||||
-rw-r--r-- | dev-libs/Ice/files/Ice-3.6.5-csharp.patch | 50 | ||||
-rw-r--r-- | dev-libs/Ice/files/Ice-3.6.5-db6.patch | 48 |
3 files changed, 0 insertions, 148 deletions
diff --git a/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch b/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch deleted file mode 100644 index 149a31e1dd6c..000000000000 --- a/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ice-3.6.3/cpp/config/Make.rules.Linux~ 2015-06-27 16:56:56.000000000 +0200 -+++ ice-3.6.3/cpp/config/Make.rules.Linux 2015-06-27 17:23:45.810591931 +0200 -@@ -79,19 +79,6 @@ - CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED - endif - -- # -- # Only use multilib -m32/-m64 options for amd64 arch, x32 arch can also run -- # in amd64 macines but doesn't use multilib, in this case MACHINE_TYPE will -- # be x86_64 and HOST_ARCH x32. -- # -- ifeq ($(HOST_ARCH),amd64) -- ifeq ($(LP64),yes) -- CXXARCHFLAGS += -m64 -- else -- CXXARCHFLAGS += -m32 -- endif -- endif -- - CXXFLAGS += $(CXXARCHFLAGS) -fvisibility=hidden -Wall -Werror -pthread - - # If MAXWARN is set then enable extra warnings ---- ice-3.6.3/config/Make.common.rules~ 2015-06-23 17:30:20.000000000 +0200 -+++ ice-3.6.3/config/Make.common.rules 2015-06-28 01:53:57.149666595 +0200 -@@ -101,25 +101,7 @@ - ifeq ($(LP64),) - LP64 = yes - endif -- -- # -- # x86 binaries build on x86_64 machine use 32 binsuffix -- # -- ifneq ($(STATICLIBS),yes) -- ifneq ($(LP64),yes) -- binsuffix = 32 -- endif -- endif - endif -- -- # -- # x86 builds uses 32 binsuffix -- # -- ifneq ($(STATICLIBS),yes) -- ifeq ($(findstring $(MACHINE_TYPE),i386 i486 i586 i686),$(MACHINE_TYPE)) -- binsuffix = 32 -- endif -- endif - endif - - ifeq ($(CPP11),yes) diff --git a/dev-libs/Ice/files/Ice-3.6.5-csharp.patch b/dev-libs/Ice/files/Ice-3.6.5-csharp.patch deleted file mode 100644 index cfdc1f6a8d47..000000000000 --- a/dev-libs/Ice/files/Ice-3.6.5-csharp.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ice-3.6.5/csharp/src/Makefile~ 2015-06-23 17:30:20.000000000 +0200 -+++ ice-3.6.5/csharp/src/Makefile 2015-06-27 20:07:04.217188211 +0200 -@@ -11,7 +11,7 @@ - - include $(top_srcdir)/config/Make.rules.cs - --SUBDIRS = Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceDiscovery IceLocatorDiscovery -+SUBDIRS = Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceSSL IceDiscovery IceLocatorDiscovery - - $(EVERYTHING):: - @for subdir in $(SUBDIRS); \ ---- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.5/csharp/lib/pkgconfig/IceSSL.pc 2015-06-27 20:19:30.731894653 +0200 -@@ -0,0 +1,10 @@ -+version = 3.6.5 -+mono_root = /usr -+ -+name = IceSSL -+ -+Name: ${name} -+Description: IceSSL run-time support -+Version: ${version} -+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll -+Requires: Ice = ${version} ---- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.5/csharp/lib/pkgconfig/IceDiscovery.pc 2015-06-27 20:20:44.312515987 +0200 -@@ -0,0 +1,10 @@ -+version = 3.6.5 -+mono_root = /usr -+ -+name = IceDiscovery -+ -+Name: ${name} -+Description: IceDiscovery run-time support -+Version: ${version} -+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll -+Requires: Ice = ${version} ---- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.5/csharp/lib/pkgconfig/IceLocatorDiscovery.pc 2015-06-27 20:21:22.206185123 +0200 -@@ -0,0 +1,10 @@ -+version = 3.6.5 -+mono_root = /usr -+ -+name = IceLocatorDiscovery -+ -+Name: ${name} -+Description: IceLocatorDiscovery run-time support -+Version: ${version} -+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll -+Requires: Ice = ${version} diff --git a/dev-libs/Ice/files/Ice-3.6.5-db6.patch b/dev-libs/Ice/files/Ice-3.6.5-db6.patch deleted file mode 100644 index b78fae76a453..000000000000 --- a/dev-libs/Ice/files/Ice-3.6.5-db6.patch +++ /dev/null @@ -1,48 +0,0 @@ -Avoid ambiguous ctor call (uint32_t vs DB_ENV*) with db 6.x. - ---- ice-3.6.3/cpp/src/Freeze/SharedDbEnv.cpp.orig 2016-10-05 16:59:08.000000000 +0200 -+++ ice-3.6.3/cpp/src/Freeze/SharedDbEnv.cpp 2017-06-28 18:42:43.411869639 +0200 -@@ -530,7 +530,7 @@ - { - if(_env == 0) - { -- _envHolder.reset(new DbEnv(0)); -+ _envHolder.reset(new DbEnv(0u)); - _env = _envHolder.get(); - - if(_trace >= 1) ---- ice-3.6.3/cpp/src/FreezeScript/transformdb.cpp.orig 2016-10-05 16:59:08.000000000 +0200 -+++ ice-3.6.3/cpp/src/FreezeScript/transformdb.cpp 2017-06-28 19:15:03.928514164 +0200 -@@ -766,8 +766,8 @@ - // - // Transform the database. - // -- DbEnv dbEnv(0); -- DbEnv dbEnvNew(0); -+ DbEnv dbEnv(0u); -+ DbEnv dbEnvNew(0u); - Freeze::TransactionPtr txNew; - Freeze::ConnectionPtr connection; - Freeze::ConnectionPtr connectionNew; ---- ice-3.6.3/cpp/src/FreezeScript/Util.cpp.orig 2016-10-05 16:59:08.000000000 +0200 -+++ ice-3.6.3/cpp/src/FreezeScript/Util.cpp 2017-06-28 19:22:29.318509063 +0200 -@@ -209,7 +209,7 @@ - { - CatalogDataMap result; - -- DbEnv dbEnv(0); -+ DbEnv dbEnv(0u); - try - { - #ifdef _WIN32 ---- ice-3.6.3/cpp/src/FreezeScript/DumpDB.cpp.orig 2016-10-05 16:59:08.000000000 +0200 -+++ ice-3.6.3/cpp/src/FreezeScript/DumpDB.cpp 2017-06-28 19:33:38.555168088 +0200 -@@ -481,7 +481,7 @@ - FreezeScript::ObjectFactoryPtr objectFactory = new FreezeScript::ObjectFactory; - communicator->addObjectFactory(objectFactory, ""); - -- DbEnv dbEnv(0); -+ DbEnv dbEnv(0u); - DbTxn* txn = 0; - Freeze::ConnectionPtr connection; - int status = EXIT_SUCCESS; |