| 1 |
jlec 14/03/26 11:20:40 |
| 2 |
|
| 3 |
Added: |
| 4 |
ball-1.4.2-PDBFile-Fix-compilation-with-gcc-4.8.patch |
| 5 |
ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch |
| 6 |
ball-1.4.2-Fix-compilation-of-sipModularWidget.patch |
| 7 |
Log: |
| 8 |
sci-chemistry/ball: Version BUmp |
| 9 |
|
| 10 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 sci-chemistry/ball/files/ball-1.4.2-PDBFile-Fix-compilation-with-gcc-4.8.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.2-PDBFile-Fix-compilation-with-gcc-4.8.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.2-PDBFile-Fix-compilation-with-gcc-4.8.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: ball-1.4.2-PDBFile-Fix-compilation-with-gcc-4.8.patch |
| 19 |
=================================================================== |
| 20 |
From e7cc50705bed20e160bd4b637b23f57270f580a8 Mon Sep 17 00:00:00 2001 |
| 21 |
From: Daniel Stoeckel <dstoeckel@×××××××××××××.de> |
| 22 |
Date: Sat, 6 Apr 2013 01:06:55 +0200 |
| 23 |
Subject: [PATCH] PDBFile:Fix compilation with gcc 4.8 |
| 24 |
|
| 25 |
Apparently the automatic conversion from boost::shared_ptr<CrystalInfo> |
| 26 |
to boost::shared_ptr<PersistentObject> is no longer supported. |
| 27 |
Just change the type of the pointer and work around this issue. |
| 28 |
--- |
| 29 |
source/FORMAT/PDBFileDetails.C | 2 +- |
| 30 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 31 |
|
| 32 |
diff --git a/source/FORMAT/PDBFileDetails.C b/source/FORMAT/PDBFileDetails.C |
| 33 |
index 97c2572..aedc5db 100644 |
| 34 |
--- a/source/FORMAT/PDBFileDetails.C |
| 35 |
+++ b/source/FORMAT/PDBFileDetails.C |
| 36 |
@@ -901,7 +901,7 @@ namespace BALL |
| 37 |
{ |
| 38 |
if (!(current_protein_->hasProperty("CRYSTALINFO"))) |
| 39 |
{ |
| 40 |
- boost::shared_ptr<CrystalInfo> temp_ptr(new CrystalInfo()); |
| 41 |
+ boost::shared_ptr<PersistentObject> temp_ptr(new CrystalInfo()); |
| 42 |
current_protein_->setProperty(NamedProperty("CRYSTALINFO", temp_ptr)); |
| 43 |
} |
| 44 |
|
| 45 |
-- |
| 46 |
1.9.1 |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.1 sci-chemistry/ball/files/ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch?rev=1.1&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch?rev=1.1&content-type=text/plain |
| 55 |
|
| 56 |
Index: ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch |
| 57 |
=================================================================== |
| 58 |
From 1e76c9cb1920e9176b725269985c7eb43126d188 Mon Sep 17 00:00:00 2001 |
| 59 |
From: Luis de la Garza <delagarza@××××××××××××××××××××××××.de> |
| 60 |
Date: Fri, 22 Nov 2013 15:18:55 +0100 |
| 61 |
Subject: [PATCH] QT4_EXTRACT_OPTIONS CMake macro changed in CMake 2.8.12; |
| 62 |
fixed BALLMacros.cmake |
| 63 |
|
| 64 |
--- |
| 65 |
cmake/BALLMacros.cmake | 14 ++++++++++---- |
| 66 |
1 file changed, 10 insertions(+), 4 deletions(-) |
| 67 |
|
| 68 |
diff --git a/cmake/BALLMacros.cmake b/cmake/BALLMacros.cmake |
| 69 |
index f81ab89..0ac1b87 100644 |
| 70 |
--- a/cmake/BALLMacros.cmake |
| 71 |
+++ b/cmake/BALLMacros.cmake |
| 72 |
@@ -6,16 +6,22 @@ |
| 73 |
### minor modifications (marked with ## BALL ###) |
| 74 |
### |
| 75 |
MACRO(QT4_WRAP_UI_BALL outfiles ) |
| 76 |
- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN}) |
| 77 |
- |
| 78 |
- ### BALL ### |
| 79 |
+ # since 2.8.12 qt4_extract_options has an additional argument |
| 80 |
+ # copied fix from OpenMS |
| 81 |
+ IF(${CMAKE_VERSION} VERSION_LESS "2.8.12") |
| 82 |
+ QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN}) |
| 83 |
+ ELSE() |
| 84 |
+ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN}) |
| 85 |
+ ENDIF() |
| 86 |
+ |
| 87 |
+ ### BALL ### |
| 88 |
# create output directory (will not exist for out-of-source builds) |
| 89 |
FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/BALL/VIEW/UIC/) |
| 90 |
|
| 91 |
FOREACH (it ${ui_files}) |
| 92 |
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) |
| 93 |
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) |
| 94 |
- ### BALL ### |
| 95 |
+ ### BALL ### |
| 96 |
SET(outfile ${PROJECT_BINARY_DIR}/include/BALL/VIEW/UIC/ui_${outfile}.h) |
| 97 |
ADD_CUSTOM_COMMAND(OUTPUT ${outfile} |
| 98 |
COMMAND ${QT_UIC_EXECUTABLE} |
| 99 |
-- |
| 100 |
1.9.1 |
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
1.1 sci-chemistry/ball/files/ball-1.4.2-Fix-compilation-of-sipModularWidget.patch |
| 106 |
|
| 107 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.2-Fix-compilation-of-sipModularWidget.patch?rev=1.1&view=markup |
| 108 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.2-Fix-compilation-of-sipModularWidget.patch?rev=1.1&content-type=text/plain |
| 109 |
|
| 110 |
Index: ball-1.4.2-Fix-compilation-of-sipModularWidget.patch |
| 111 |
=================================================================== |
| 112 |
From da49802f8620562f91ac2c947520dccd223ee26b Mon Sep 17 00:00:00 2001 |
| 113 |
From: Andreas Hildebrandt <andreas.hildebrandt@×××××××××.de> |
| 114 |
Date: Wed, 15 Jan 2014 17:42:01 +0100 |
| 115 |
Subject: [PATCH] Fix compilation of sipModularWidget |
| 116 |
|
| 117 |
--- |
| 118 |
source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip | 10 +++++----- |
| 119 |
1 file changed, 5 insertions(+), 5 deletions(-) |
| 120 |
|
| 121 |
diff --git a/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip b/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip |
| 122 |
index 522b0ed..7b8ba3e 100644 |
| 123 |
--- a/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip |
| 124 |
+++ b/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip |
| 125 |
@@ -22,18 +22,18 @@ class ModularWidget |
| 126 |
static Size countInstances(); |
| 127 |
static ModularWidget* getInstance(Position); |
| 128 |
|
| 129 |
- ModularWidget(const char* = "<ModularWidget>") throw(); |
| 130 |
- ModularWidget(const ModularWidget&) throw(); |
| 131 |
+ ModularWidget(const char* = "<ModularWidget>"); |
| 132 |
+ ModularWidget(const ModularWidget&); |
| 133 |
~ModularWidget() throw(); |
| 134 |
|
| 135 |
- virtual void destroy() throw(); |
| 136 |
- virtual void clear() throw(); |
| 137 |
+// virtual void destroy(); |
| 138 |
+ virtual void clear(); |
| 139 |
|
| 140 |
static void registerWidget(ModularWidget*) throw(NullPointer); |
| 141 |
// virtual void initializeWidget(MainControl&); |
| 142 |
// virtual void finalizeWidget(MainControl&); |
| 143 |
virtual void checkMenu(MainControl&) throw(); |
| 144 |
-// virtual void initializePreferencesTab(Preferences&) throw(); |
| 145 |
+// virtual void initializePreferencesTab(Preferences&); |
| 146 |
// virtual void finalizePreferencesTab(Preferences&) throw(); |
| 147 |
virtual void applyPreferences() throw(); |
| 148 |
virtual void fetchPreferences(INIFile&) throw(); |
| 149 |
-- |
| 150 |
1.9.1 |
Archives