jlec 14/03/26 11:20:40
Added:
ball-1.4.2-PDBFile-Fix-compilation-with-gcc-4.8.patch
ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch
ball-1.4.2-Fix-compilation-of-sipModularWidget.patch
Log:
sci-chemistry/ball: Version BUmp
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.1
sci-chemistry/ball/files/ball-1.4.2-PDBFile-Fix-compilation-with-gcc-4.8.patch
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
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
Index: ball-1.4.2-PDBFile-Fix-compilation-with-gcc-4.8.patch
===================================================================
>From e7cc50705bed20e160bd4b637b23f57270f580a8 Mon Sep 17 00:00:00 2001
From: Daniel Stoeckel <[email protected]>
Date: Sat, 6 Apr 2013 01:06:55 +0200
Subject: [PATCH] PDBFile:Fix compilation with gcc 4.8
Apparently the automatic conversion from boost::shared_ptr<CrystalInfo>
to boost::shared_ptr<PersistentObject> is no longer supported.
Just change the type of the pointer and work around this issue.
---
source/FORMAT/PDBFileDetails.C | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/FORMAT/PDBFileDetails.C b/source/FORMAT/PDBFileDetails.C
index 97c2572..aedc5db 100644
--- a/source/FORMAT/PDBFileDetails.C
+++ b/source/FORMAT/PDBFileDetails.C
@@ -901,7 +901,7 @@ namespace BALL
{
if (!(current_protein_->hasProperty("CRYSTALINFO")))
{
- boost::shared_ptr<CrystalInfo> temp_ptr(new
CrystalInfo());
+ boost::shared_ptr<PersistentObject> temp_ptr(new
CrystalInfo());
current_protein_->setProperty(NamedProperty("CRYSTALINFO", temp_ptr));
}
--
1.9.1
1.1
sci-chemistry/ball/files/ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch
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
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
Index: ball-1.4.2-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch
===================================================================
>From 1e76c9cb1920e9176b725269985c7eb43126d188 Mon Sep 17 00:00:00 2001
From: Luis de la Garza <[email protected]>
Date: Fri, 22 Nov 2013 15:18:55 +0100
Subject: [PATCH] QT4_EXTRACT_OPTIONS CMake macro changed in CMake 2.8.12;
fixed BALLMacros.cmake
---
cmake/BALLMacros.cmake | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/cmake/BALLMacros.cmake b/cmake/BALLMacros.cmake
index f81ab89..0ac1b87 100644
--- a/cmake/BALLMacros.cmake
+++ b/cmake/BALLMacros.cmake
@@ -6,16 +6,22 @@
### minor modifications (marked with ## BALL ###)
###
MACRO(QT4_WRAP_UI_BALL outfiles )
- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
-
- ### BALL ###
+ # since 2.8.12 qt4_extract_options has an additional argument
+ # copied fix from OpenMS
+ IF(${CMAKE_VERSION} VERSION_LESS "2.8.12")
+ QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
+ ELSE()
+ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
+ ENDIF()
+
+ ### BALL ###
# create output directory (will not exist for out-of-source builds)
FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/BALL/VIEW/UIC/)
FOREACH (it ${ui_files})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
- ### BALL ###
+ ### BALL ###
SET(outfile ${PROJECT_BINARY_DIR}/include/BALL/VIEW/UIC/ui_${outfile}.h)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_UIC_EXECUTABLE}
--
1.9.1
1.1
sci-chemistry/ball/files/ball-1.4.2-Fix-compilation-of-sipModularWidget.patch
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
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
Index: ball-1.4.2-Fix-compilation-of-sipModularWidget.patch
===================================================================
>From da49802f8620562f91ac2c947520dccd223ee26b Mon Sep 17 00:00:00 2001
From: Andreas Hildebrandt <[email protected]>
Date: Wed, 15 Jan 2014 17:42:01 +0100
Subject: [PATCH] Fix compilation of sipModularWidget
---
source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip
b/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip
index 522b0ed..7b8ba3e 100644
--- a/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip
+++ b/source/PYTHON/EXTENSIONS/VIEW/modularWidget.sip
@@ -22,18 +22,18 @@ class ModularWidget
static Size countInstances();
static ModularWidget* getInstance(Position);
- ModularWidget(const char* = "<ModularWidget>") throw();
- ModularWidget(const ModularWidget&) throw();
+ ModularWidget(const char* = "<ModularWidget>");
+ ModularWidget(const ModularWidget&);
~ModularWidget() throw();
- virtual void destroy() throw();
- virtual void clear() throw();
+// virtual void destroy();
+ virtual void clear();
static void registerWidget(ModularWidget*) throw(NullPointer);
// virtual void initializeWidget(MainControl&);
// virtual void finalizeWidget(MainControl&);
virtual void checkMenu(MainControl&) throw();
-// virtual void initializePreferencesTab(Preferences&) throw();
+// virtual void initializePreferencesTab(Preferences&);
// virtual void finalizePreferencesTab(Preferences&) throw();
virtual void applyPreferences() throw();
virtual void fetchPreferences(INIFile&) throw();
--
1.9.1
