Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/luminance-hdr/files: luminance-hdr-2.3.0_beta1-no-git.patch
Date: Sat, 30 Jun 2012 16:46:00
Message-Id: 20120630164544.929C92004C@flycatcher.gentoo.org
1 radhermit 12/06/30 16:45:44
2
3 Added: luminance-hdr-2.3.0_beta1-no-git.patch
4 Log:
5 Version bump.
6
7 (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-gfx/luminance-hdr/files/luminance-hdr-2.3.0_beta1-no-git.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.0_beta1-no-git.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.0_beta1-no-git.patch?rev=1.1&content-type=text/plain
14
15 Index: luminance-hdr-2.3.0_beta1-no-git.patch
16 ===================================================================
17 --- luminance-hdr-2.3.0.beta1/CMakeLists.txt
18 +++ luminance-hdr-2.3.0.beta1/CMakeLists.txt
19 @@ -36,26 +36,6 @@
20
21 set(LIBS ${LIBS} ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
22
23 -FIND_PACKAGE(Git)
24 -#FIND_PACKAGE(Git QUIET)
25 -IF(NOT GIT_FOUND)
26 - FIND_FILE(GIT_EXECUTABLE git.exe
27 - $ENV{CYGWIN_DIR}\\bin
28 - $ENV{CYGWIN_DIR}
29 - )
30 - IF (EXISTS ${GIT_EXECUTABLE})
31 - SET(GIT_FOUND 1)
32 - ENDIF()
33 -ENDIF()
34 -
35 -IF(GIT_FOUND)
36 - include(GetGitRevisionDescription)
37 - get_git_head_revision(GIT_REFSPEC GIT_SHA1)
38 - message(STATUS "Git found")
39 -ELSE()
40 - message(STATUS "Git not found")
41 -ENDIF()
42 -
43 IF(WIN32)
44 # Windows Section
45
46 --- luminance-hdr-2.3.0.beta1/src/Common/CMakeLists.txt
47 +++ luminance-hdr-2.3.0.beta1/src/Common/CMakeLists.txt
48 @@ -1,4 +1,3 @@
49 -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp @ONLY)
50 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/global.hxx.in ${CMAKE_CURRENT_BINARY_DIR}/global.hxx @ONLY)
51
52 SET(FILES_UI
53 @@ -25,8 +24,7 @@
54 QT4_WRAP_UI(FILES_UI_H ${FILES_UI})
55
56 ADD_LIBRARY(common ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX} ${FILES_UI_H}
57 -${CMAKE_CURRENT_BINARY_DIR}/global.hxx
58 -${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp)
59 +${CMAKE_CURRENT_BINARY_DIR}/global.hxx)
60
61 SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
62 SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} common PARENT_SCOPE)
63 --- luminance-hdr-2.3.0.beta1/src/UI/UMessageBox.cpp
64 +++ luminance-hdr-2.3.0.beta1/src/UI/UMessageBox.cpp
65 @@ -28,7 +28,6 @@
66
67 #include "UI/UMessageBox.h"
68
69 -#include "Common/GitSHA1.h"
70 #include "Common/config.h"
71 #include "Common/archs.h"
72 #include "ui_about.h"
73 @@ -78,7 +77,7 @@
74 ui.authorsBox->setOpenExternalLinks(true);
75 ui.thanksToBox->setOpenExternalLinks(true);
76 ui.GPLbox->setTextInteractionFlags(Qt::TextSelectableByMouse);
77 - ui.label_version->setText(ui.label_version->text().append(QString(LUMINANCEVERSION)).append(" [Build ").append(QString(g_GIT_SHA1).left(6)).append("]"));
78 + ui.label_version->setText(ui.label_version->text().append(QString(LUMINANCEVERSION)));
79
80 bool license_file_not_found=true;
81 QString docDir = QCoreApplication::applicationDirPath();