Hello community,
here is the log from the commit of package automoc4 for openSUSE:Factory
checked in at Wed Jan 28 23:28:34 CET 2009.
--------
--- KDE/automoc4/automoc4.changes 2008-09-09 01:23:30.000000000 +0200
+++ automoc4/automoc4.changes 2009-01-22 19:54:11.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Jan 22 19:53:02 CET 2009 - dmueller@suse.de
+
+- update to 0.9.88:
+ * improved dep handling
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
automoc4-0.9.87.tar.bz2
New:
----
automoc4-0.9.88.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ automoc4.spec ++++++
--- /var/tmp/diff_new_pack.C17173/_old 2009-01-28 23:27:48.000000000 +0100
+++ /var/tmp/diff_new_pack.C17173/_new 2009-01-28 23:27:48.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package automoc4 (Version 0.9.87)
+# spec file for package automoc4 (Version 0.9.88)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,8 +20,8 @@
Name: automoc4
BuildRequires: cmake kde4-filesystem libqt4-devel
-Version: 0.9.87
-Release: 23
+Version: 0.9.88
+Release: 1
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Tools/Building
@@ -63,14 +63,17 @@
%_libdir/automoc4
%changelog
+* Thu Jan 22 2009 dmueller@suse.de
+- update to 0.9.88:
+ * improved dep handling
* Tue Sep 09 2008 dmueller@suse.de
- fix requires for old distros
* Mon Aug 11 2008 dmueller@suse.de
- update to 0.9.87:
* automoc4_add_library macro added
-* Fri Aug 08 2008 dmueller@suse.de
+* Thu Aug 07 2008 dmueller@suse.de
- fix build after last change
-* Thu Aug 07 2008 wstephenson@suse.de
+* Wed Aug 06 2008 wstephenson@suse.de
- update to 0.9.84
* no significant change
* Fri Jun 20 2008 dmueller@suse.de
@@ -79,5 +82,5 @@
* Tue May 27 2008 dmueller@suse.de
- update to 813373:
* fix issues with building moc files in parallel
-* Sat May 03 2008 dmueller@suse.de
+* Fri May 02 2008 dmueller@suse.de
- Initial package
++++++ automoc4-0.9.87.tar.bz2 -> automoc4-0.9.88.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/automoc4-0.9.87/Automoc4Config.cmake new/automoc4-0.9.88/Automoc4Config.cmake
--- old/automoc4-0.9.87/Automoc4Config.cmake 2008-08-05 17:34:02.000000000 +0200
+++ new/automoc4-0.9.88/Automoc4Config.cmake 2009-01-22 19:50:09.000000000 +0100
@@ -1,4 +1,53 @@
+# It also adds the following macros
+# AUTOMOC4(<target> )
+# Use this to run automoc4 on all files contained in the list .
+#
+# AUTOMOC4_MOC_HEADERS(<target> header1.h header2.h ...)
+# Use this to add more header files to be processed with automoc4.
+#
+# AUTOMOC4_ADD_EXECUTABLE( src1 src2 ...)
+# This macro does the same as ADD_EXECUTABLE, but additionally
+# adds automoc4 handling for all source files.
+#
+# AUTOMOC4_ADD_LIBRARY( src1 src2 ...)
+# This macro does the same as ADD_LIBRARY, but additionally
+# adds automoc4 handling for all source files.
+
+# Internal helper macro, may change or be removed anytime:
+# _ADD_AUTOMOC4_TARGET( )
+#
+# Since version 0.9.88:
+# The following two macros are only to be used for KDE4 projects
+# and do something which makes sure automoc4 works for KDE. Don't
+# use them anywhere else. See kdelibs/cmake/modules/KDE4Macros.cmake.
+# _AUTOMOC4_KDE4_PRE_TARGET_HANDLING( )
+# _AUTOMOC4_KDE4_POST_TARGET_HANDLING()
+
+# Copyright (C) 2007 Matthias Kretz
+# Copyright (C) 2008-2009 Alexander Neundorf
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
get_filename_component(_AUTOMOC4_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
@@ -15,6 +64,7 @@
get_filename_component(_AUTOMOC4_BIN_DIR "${_AUTOMOC4_BIN_DIR}" PATH)
find_program(AUTOMOC4_EXECUTABLE automoc4 PATHS "${_AUTOMOC4_BIN_DIR}/bin" NO_DEFAULT_PATH)
set(_AUTOMOC4_EXECUTABLE_DEP)
+ mark_as_advanced(AUTOMOC4_EXECUTABLE)
endif(EXISTS ${_AUTOMOC4_CURRENT_DIR}/kde4automoc.cpp)
@@ -86,7 +136,7 @@
endif(_moc_files)
endmacro(AUTOMOC4)
-macro(ADD_AUTOMOC4_TARGET _target_NAME _SRCS)
+macro(_ADD_AUTOMOC4_TARGET _target_NAME _SRCS)
set(_moc_files)
set(_moc_headers)
@@ -133,22 +183,25 @@
configure_file(${_AUTOMOC4_CURRENT_DIR}/automoc4.files.in ${_automoc_dotFiles})
add_custom_target(${_target_NAME}
- ALL
COMMAND ${AUTOMOC4_EXECUTABLE}
${_automoc_source}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${QT_MOC_EXECUTABLE}
${CMAKE_COMMAND}
- DEPENDS ${_automoc_dotFiles} ${_AUTOMOC4_EXECUTABLE_DEP} ${_moc_headers} ${${_SRCS}}
COMMENT ""
VERBATIM
)
+
+ if(_AUTOMOC4_EXECUTABLE_DEP)
+ add_dependencies(${_target_NAME} ${_AUTOMOC4_EXECUTABLE_DEP})
+ endif(_AUTOMOC4_EXECUTABLE_DEP)
+
set_source_files_properties(${_automoc_source} PROPERTIES GENERATED TRUE)
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_automoc_source})
set(${_SRCS} ${_automoc_source} ${${_SRCS}})
endif(_moc_files)
-endmacro(ADD_AUTOMOC4_TARGET)
+endmacro(_ADD_AUTOMOC4_TARGET)
macro(AUTOMOC4_ADD_EXECUTABLE _target_NAME)
set(_SRCS ${ARGN})
@@ -162,15 +215,10 @@
endif(_index GREATER -1)
endforeach(_argName)
- if(MSVC)
- add_automoc4_target("${_target_NAME}_automoc" _SRCS)
- else(MSVC)
- automoc4(${_target_NAME} _SRCS)
- endif(MSVC)
+ _add_automoc4_target("${_target_NAME}_automoc" _SRCS)
add_executable(${_target_NAME} ${_add_executable_param} ${_SRCS})
- if(MSVC)
- add_dependencies(${_target_NAME} "${_target_NAME}_automoc")
- endif(MSVC)
+ add_dependencies(${_target_NAME} "${_target_NAME}_automoc")
+
endmacro(AUTOMOC4_ADD_EXECUTABLE)
macro(AUTOMOC4_ADD_LIBRARY _target_NAME)
@@ -185,13 +233,17 @@
endif(_index GREATER -1)
endforeach(_argName)
- if(MSVC)
- add_automoc4_target("${_target_NAME}_automoc" _SRCS)
- else(MSVC)
- automoc4(${_target_NAME} _SRCS)
- endif(MSVC)
+ _add_automoc4_target("${_target_NAME}_automoc" _SRCS)
add_library(${_target_NAME} ${_add_executable_param} ${_SRCS})
- if(MSVC)
- add_dependencies(${_target_NAME} "${_target_NAME}_automoc")
- endif(MSVC)
+ add_dependencies(${_target_NAME} "${_target_NAME}_automoc")
endmacro(AUTOMOC4_ADD_LIBRARY)
+
+
+macro(_AUTOMOC4_KDE4_PRE_TARGET_HANDLING _target _srcs)
+ _add_automoc4_target("${_target}_automoc" ${_srcs})
+endmacro(_AUTOMOC4_KDE4_PRE_TARGET_HANDLING)
+
+
+macro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING _target)
+ add_dependencies(${_target} "${_target}_automoc")
+endmacro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/automoc4-0.9.87/Automoc4Version.cmake new/automoc4-0.9.88/Automoc4Version.cmake
--- old/automoc4-0.9.87/Automoc4Version.cmake 2008-08-06 16:55:45.000000000 +0200
+++ new/automoc4-0.9.88/Automoc4Version.cmake 2009-01-22 19:50:09.000000000 +0100
@@ -1,7 +1,7 @@
# set the current version number
set(AUTOMOC4_VERSION_MAJOR "0")
set(AUTOMOC4_VERSION_MINOR "9")
-set(AUTOMOC4_VERSION_PATCH "87")
+set(AUTOMOC4_VERSION_PATCH "88")
set(AUTOMOC4_VERSION "${AUTOMOC4_VERSION_MAJOR}.${AUTOMOC4_VERSION_MINOR}.${AUTOMOC4_VERSION_PATCH}")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/automoc4-0.9.87/kde4automoc.cpp new/automoc4-0.9.88/kde4automoc.cpp
--- old/automoc4-0.9.87/kde4automoc.cpp 2008-08-06 17:11:28.000000000 +0200
+++ new/automoc4-0.9.88/kde4automoc.cpp 2009-01-22 19:50:09.000000000 +0100
@@ -284,7 +284,7 @@
QRegExp mocIncludeRegExp(QLatin1String("[\n]\\s*#\\s*include\\s+[\"<]((?:[^ \">]+/)?moc_[^ \">/]+\\.cpp|[^ \">]+\\.moc)[\">]"));
QRegExp qObjectRegExp(QLatin1String("[\n]\\s*Q_OBJECT\\b"));
QStringList headerExtensions;
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
// not case sensitive
headerExtensions << ".h" << ".hpp" << ".hxx";
#else
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org