[SCM] recorditnow packaging branch, master, updated. 8a48f3022890f05e7168050f44598577f1df7b8f
Eshat Cakar
eshat-guest at alioth.debian.org
Thu Sep 1 16:44:13 UTC 2011
The following commit has been merged in the master branch:
commit 8a48f3022890f05e7168050f44598577f1df7b8f
Author: Eshat Cakar <info at eshat.de>
Date: Thu Sep 1 18:42:00 2011 +0200
unapply patches and remove&ignore quilt files
---
.gitignore | 1 +
.pc/.quilt_patches | 1 -
.pc/.quilt_series | 1 -
.pc/.version | 1 -
.../joschycore/CMakeLists.txt | 54 --------
.../src/CMakeLists.txt | 138 --------------------
.../joschycore/joschycore/CMakeLists.txt | 45 -------
.pc/applied-patches | 3 -
joschy-snapshot-23-02-10/joschycore/CMakeLists.txt | 9 ++
.../joschycore/joschycore/CMakeLists.txt | 1 +
src/CMakeLists.txt | 6 +-
11 files changed, 12 insertions(+), 248 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.pc/01_joschy_install_to_usr_lib.diff/joschy-snapshot-23-02-10/joschycore/CMakeLists.txt b/.pc/01_joschy_install_to_usr_lib.diff/joschy-snapshot-23-02-10/joschycore/CMakeLists.txt
deleted file mode 100644
index dc41165..0000000
--- a/.pc/01_joschy_install_to_usr_lib.diff/joschy-snapshot-23-02-10/joschycore/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-project(joschycore)
-
-cmake_minimum_required(VERSION 2.6)
-
-
-if (WIN32 AND NOT BUID_WITH_JOSCHYCORE)
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-enable-auto-image-base -Wl,-enable-auto-import")
-endif (WIN32 AND NOT BUID_WITH_JOSCHYCORE)
-
-
-# find Qt4
-if (NOT BUILD_WITH_JOSCHYCORE)
- find_package(Qt4 REQUIRED)
-endif (NOT BUILD_WITH_JOSCHYCORE)
-
-set(QT_DONT_USE_QTGUI true)
-include(${QT_USE_FILE})
-
-# 64 bit?
-if (NOT WIN32)
- if(CMAKE_SIZEOF_VOID_P EQUAL 4)
- SET(LIB_SUFFIX "")
- else(CMAKE_SIZEOF_VOID_P EQUAL 4)
- SET(LIB_SUFFIX 64)
- endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-endif(NOT WIN32)
-
-# cflags
-if (NOT WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS_RELWITHDEBUGINFO "-g -O3 ${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS_DEBUG "-g -ggdb ${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -ffast-math ${CMAKE_CXX_FLAGS_DEBUG}")
-endif(NOT WIN32)
-
-# paths
-set(JOSCHY_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE FILEPATH "Install path for libs")
-set(JOSCHY_PLUGIN_INSTALL_DIR ${JOSCHY_LIBRARY_INSTALL_DIR}/joschy CACHE FILEPATH "Install path for plugins")
-set(JOSCHY_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/joschycore)
-
-# definitions
-add_definitions(${QT_DEFINITIONS} -DJOSCHY_LIBRARY -DJOSCHY_PLUGINDIR="${JOSCHY_PLUGIN_INSTALL_DIR}")
-
-
-# src
-add_subdirectory(joschycore)
-
-
-message(STATUS "----------------------")
-message(STATUS "LIBRARY_INSTALL_DIR=" ${JOSCHY_LIBRARY_INSTALL_DIR})
-message(STATUS "PLUGIN_INSTALL_DIR=" ${JOSCHY_PLUGIN_INSTALL_DIR})
-message(STATUS "INCLUDE_INSTALL_DIR=" ${JOSCHY_INCLUDE_INSTALL_DIR})
-message(STATUS "----------------------")
diff --git a/.pc/02_fix_ftbfs_no-add-needed.diff/src/CMakeLists.txt b/.pc/02_fix_ftbfs_no-add-needed.diff/src/CMakeLists.txt
deleted file mode 100644
index 4767fff..0000000
--- a/.pc/02_fix_ftbfs_no-add-needed.diff/src/CMakeLists.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-include_directories(${CMAKE_SOURCE_DIR}/src/libs/plugin
- ${CMAKE_SOURCE_DIR}/src/libs/recorder
- ${CMAKE_SOURCE_DIR}/src/libs/encoder
- ${CMAKE_SOURCE_DIR}/src/libs/upload
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}
- ${KDE4_INCLUDES})
-
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
-
-
-if (BUILD_WITH_JOSCHY)
- include_directories(${JOSCHY_SNAPSHOT_INCLUDE_DIR})
-endif (BUILD_WITH_JOSCHY)
-
-macro_optional_find_package(XFixes)
-macro_log_feature(XFIXES_FOUND "XFixes"
- "X.Org Xfixes library"
- "http://xorg.freedesktop.org/")
-
-if (XFIXES_FOUND)
- add_definitions(-DXFIXES_FOUND=true)
-endif()
-
-
-add_subdirectory(libs)
-add_subdirectory(plugins)
-add_subdirectory(icons)
-add_subdirectory(keymon)
-
-macro_display_feature_log()
-
-
-set(gui_SRCS
- main.cpp
- mainwindow.cpp
- recorditnowpluginmanager.cpp
- recordermanager.cpp
- encodermanager.cpp
- cursorwidget.cpp
- application.cpp
- keymonmanager.cpp
- devicesearchdialog.cpp
- checkicon.cpp
-
- zoom/zoomview.cpp
- zoom/zoomdock.cpp
-
- frame/frame.cpp
- frame/frameinfowidget.cpp
- frame/movewidget.cpp
-
- timeline/timelinedock.cpp
- timeline/timeline.cpp
- timeline/timelinetopicsdialog.cpp
- timeline/topicwidget.cpp
- timeline/topic.cpp
- timeline/topictreeitem.cpp
-
- upload/pluginpage.cpp
- upload/uploadwizard.cpp
- upload/videopage.cpp
- upload/accountpage.cpp
- upload/termspage.cpp
- upload/uploadpage.cpp
-
- keyboard/keyboarddock.cpp
- keyboard/keywidget.cpp
- keyboard/flowlayout.cpp
- keyboard/keyboardkey.cpp
- keyboard/proxylayout.cpp
-
- config/configdialog.cpp
- config/frameconfig.cpp
- config/keyboardconfig.cpp
- config/keyboardwizard.cpp
- config/keyboardkeypage.cpp
- config/keyboardkeyiconpage.cpp
- config/mouseconfig.cpp
- config/mousebutton.cpp
- config/configpage.cpp
- config/shortcutsconfig.cpp
- config/zoomconfig.cpp
- config/timelineconfig.cpp
- config/pluginconfig.cpp)
-
-
-# GUI
-kde4_add_ui_files(gui_SRCS
- ui/toolbarwidget.ui
- ui/settings.ui
- ui/mouseconfig.ui
- ui/zoom.ui
- ui/timeline.ui
- ui/timelinetopics.ui
- ui/timelineconfig.ui
- ui/frameconfig.ui
- upload/ui/pluginpage.ui
- upload/ui/videopage.ui
- upload/ui/uploadpage.ui
- upload/ui/termspage.ui
- upload/ui/accountpage.ui
- ui/keyboarddock.ui
- ui/keyboardconfig.ui
- ui/keyboardkeypage.ui
- ui/keyboardkeyiconpage.ui
- ui/keyboarddocktitlewidget.ui
- ui/devicesearchdialog.ui
- ui/shortcutsconfig.ui
- ui/pluginconfig.ui
- ui/timelinedocktitlewidget.ui
- ui/zoomdock.ui
- ui/zoomdocktitlewidget.ui)
-
-
-kde4_add_kcfg_files(gui_SRCS recorditnow.kcfgc)
-kde4_add_executable(recorditnow ${gui_SRCS})
-target_link_libraries(recorditnow ${KDE4_KDEUI_LIBS}
- ${KDE4_KUTILS_LIBS}
- ${KDE4_KIO_LIBS}
- recorditnow_recorder
- recorditnow_encoder
- recorditnow_keymon
- ${X11_Xcursor_LIB})
-
-if (BUILD_WITH_JOSCHY)
- target_link_libraries(recorditnow ${JOSCHY_SNAPSHOT_LIBRARIES})
-else (BUILD_WITH_JOSCHY)
- target_link_libraries(recorditnow ${JOSCHYCORE_LIBRARIES})
-endif (BUILD_WITH_JOSCHY)
-
-install(TARGETS recorditnow ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-add_subdirectory(keyboard)
-
-########### install files ###############
-install(FILES recorditnow.kcfg DESTINATION ${KCFG_INSTALL_DIR})
-install(FILES recorditnowui.rc DESTINATION ${DATA_INSTALL_DIR}/recorditnow)
diff --git a/.pc/03_dont_install_header_files.diff/joschy-snapshot-23-02-10/joschycore/joschycore/CMakeLists.txt b/.pc/03_dont_install_header_files.diff/joschy-snapshot-23-02-10/joschycore/joschycore/CMakeLists.txt
deleted file mode 100644
index 96d173b..0000000
--- a/.pc/03_dont_install_header_files.diff/joschy-snapshot-23-02-10/joschycore/joschycore/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDE_DIR})
-
-set(SRCS
- manager.cpp
- plugin.cpp
- abstractnetworklayer.cpp
- abstractprovider.cpp
- video.cpp
- plugininfo.cpp
- pluginmanager.cpp
- postfile.cpp
- abstractresponseparser.cpp
- scheduler.cpp
- schedulerthread.cpp
- abstractjob.cpp
- config.cpp
- actionreply.cpp)
-
-set(HEADERS
- manager.h
- plugin.h
- abstractnetworklayer.h
- abstractprovider.h
- video.h
- joschy_global.h
- plugininfo.h
- postfile.h
- abstractresponseparser.h
- scheduler.h
- abstractjob.h
- joschy_version.h
- config.h
- actionreply.h)
-
-
-
-QT4_AUTOMOC(${SRCS})
-add_library(joschycore SHARED ${SRCS})
-target_link_libraries(joschycore ${QT_LIBRARIES})
-INSTALL(TARGETS joschycore DESTINATION ${JOSCHY_LIBRARY_INSTALL_DIR})
-install(FILES ${HEADERS} DESTINATION ${JOSCHY_INCLUDE_INSTALL_DIR} COMPONENT Devel)
-
-#add_subdirectory(qt)
-#add_subdirectory(provider)
diff --git a/.pc/applied-patches b/.pc/applied-patches
deleted file mode 100644
index f9dd15e..0000000
--- a/.pc/applied-patches
+++ /dev/null
@@ -1,3 +0,0 @@
-01_joschy_install_to_usr_lib.diff
-02_fix_ftbfs_no-add-needed.diff
-03_dont_install_header_files.diff
diff --git a/joschy-snapshot-23-02-10/joschycore/CMakeLists.txt b/joschy-snapshot-23-02-10/joschycore/CMakeLists.txt
index 2b91187..dc41165 100644
--- a/joschy-snapshot-23-02-10/joschycore/CMakeLists.txt
+++ b/joschy-snapshot-23-02-10/joschycore/CMakeLists.txt
@@ -16,6 +16,15 @@ endif (NOT BUILD_WITH_JOSCHYCORE)
set(QT_DONT_USE_QTGUI true)
include(${QT_USE_FILE})
+# 64 bit?
+if (NOT WIN32)
+ if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ SET(LIB_SUFFIX "")
+ else(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ SET(LIB_SUFFIX 64)
+ endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+endif(NOT WIN32)
+
# cflags
if (NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
diff --git a/joschy-snapshot-23-02-10/joschycore/joschycore/CMakeLists.txt b/joschy-snapshot-23-02-10/joschycore/joschycore/CMakeLists.txt
index e08dee2..96d173b 100644
--- a/joschy-snapshot-23-02-10/joschycore/joschycore/CMakeLists.txt
+++ b/joschy-snapshot-23-02-10/joschycore/joschycore/CMakeLists.txt
@@ -39,6 +39,7 @@ QT4_AUTOMOC(${SRCS})
add_library(joschycore SHARED ${SRCS})
target_link_libraries(joschycore ${QT_LIBRARIES})
INSTALL(TARGETS joschycore DESTINATION ${JOSCHY_LIBRARY_INSTALL_DIR})
+install(FILES ${HEADERS} DESTINATION ${JOSCHY_INCLUDE_INSTALL_DIR} COMPONENT Devel)
#add_subdirectory(qt)
#add_subdirectory(provider)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 993f033..4767fff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -121,11 +121,7 @@ target_link_libraries(recorditnow ${KDE4_KDEUI_LIBS}
recorditnow_recorder
recorditnow_encoder
recorditnow_keymon
- recorditnow_plugin
- ${X11_X11_LIB}
- ${X11_Xcursor_LIB}
- ${X11_Xfixes_LIB}
- ${X11_Xext_LIB})
+ ${X11_Xcursor_LIB})
if (BUILD_WITH_JOSCHY)
target_link_libraries(recorditnow ${JOSCHY_SNAPSHOT_LIBRARIES})
--
recorditnow packaging
More information about the pkg-kde-commits
mailing list