Hello community, here is the log from the commit of package ruby-kde4 for openSUSE:Factory checked in at 2013-07-08 07:33:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-kde4 (Old) and /work/SRC/openSUSE:Factory/.ruby-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-kde4/ruby-kde4.changes 2013-06-11 09:37:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ruby-kde4.new/ruby-kde4.changes 2013-07-08 07:33:48.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Jun 27 18:11:59 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php +- Drop use-correct-components.patch and korundum-ruby19.patch, merged + upstream + +------------------------------------------------------------------- +Tue Jun 18 01:20:23 UTC 2013 - hrvoje.sen...@gmail.com + +- use-correct-components.patch, makes korundum compile + +------------------------------------------------------------------- +Thu Jun 13 19:15:36 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- korundum-4.10.4.tar.xz korundum-ruby19.patch New: ---- korundum-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-kde4.spec ++++++ --- /var/tmp/diff_new_pack.H05Yat/_old 2013-07-08 07:33:49.000000000 +0200 +++ /var/tmp/diff_new_pack.H05Yat/_new 2013-07-08 07:33:49.000000000 +0200 @@ -32,12 +32,11 @@ Summary: Korundum Ruby-KDE library License: LGPL-2.1+ Group: Development/Libraries/KDE -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: korundum-%{version}.tar.xz Url: https://projects.kde.org/projects/kde/kdebindings/ruby/korundum Patch0: no-examples.diff -Patch1: korundum-ruby19.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ruby-qt4 = %version %kde4_runtime_requires @@ -49,9 +48,6 @@ %prep %setup -q -n korundum-%{version} %patch0 -%if 0%{?suse_version} >= 1220 -%patch1 -p1 -%endif %build %cmake_kde4 -d build ++++++ korundum-4.10.4.tar.xz -> korundum-4.10.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/korundum-4.10.4/CMakeLists.txt new/korundum-4.10.90/CMakeLists.txt --- old/korundum-4.10.4/CMakeLists.txt 2013-05-28 20:43:50.000000000 +0200 +++ new/korundum-4.10.90/CMakeLists.txt 2013-06-25 20:21:27.000000000 +0200 @@ -6,7 +6,7 @@ find_package(KDE4 REQUIRED) find_package(QtRuby4 REQUIRED) find_package(Smoke REQUIRED - COMPONENTS KdeCore + COMPONENTS KdeCore KdeUi KFile KHtml @@ -22,9 +22,11 @@ Solid Soprano SopranoClient - SopranoServer ) + SopranoServer + Nepomuk ) +find_package(Smoke COMPONENTS Akonadi Okular Kate) include(KDE4Defaults) -include_directories( ${KDE4_INCLUDES} ${SMOKE_INCLUDE_DIR} ${SMOKE_INSTALL_PREFIX}/include/qtruby ) +include_directories( ${KDE4_INCLUDES} ${SMOKE_INCLUDE_DIR} ${QTRUBY_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${SMOKE_KDECORE_INCLUDE_DIR} ) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR}) include(MacroOptionalFindPackage) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/korundum-4.10.4/modules/CMakeLists.txt new/korundum-4.10.90/modules/CMakeLists.txt --- old/korundum-4.10.4/modules/CMakeLists.txt 2013-05-28 20:43:50.000000000 +0200 +++ new/korundum-4.10.90/modules/CMakeLists.txt 2013-06-25 20:21:27.000000000 +0200 @@ -17,11 +17,11 @@ macro_optional_add_bindings(Soprano_FOUND "Soprano" soprano) -if(KDEPIMLIBS_FOUND AND Akonadi_FOUND) +if(KDEPIMLIBS_FOUND AND Akonadi_FOUND AND SMOKE_AKONADI_FOUND) set(BUILD_Akonadi TRUE) -else(KDEPIMLIBS_FOUND AND Akonadi_FOUND) +else(KDEPIMLIBS_FOUND AND Akonadi_FOUND AND SMOKE_AKONADI_FOUND) set(BUILD_Akonadi FALSE) -endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND) +endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND AND SMOKE_AKONADI_FOUND) macro_optional_add_bindings(BUILD_Akonadi "Akonadi" akonadi) add_subdirectory(kio) @@ -31,18 +31,28 @@ add_subdirectory(plasma) # For nepomuk, we also must have found soprano, since soprano headers are used: -if(Soprano_FOUND AND Nepomuk_FOUND) +if(Soprano_FOUND AND Nepomuk_FOUND AND SMOKE_NEPOMUK_FOUND) set(BUILD_Nepomuk TRUE) -else(Soprano_FOUND AND Nepomuk_FOUND) +else(Soprano_FOUND AND Nepomuk_FOUND AND SMOKE_NEPOMUK_FOUND) set(BUILD_Nepomuk FALSE) -endif(Soprano_FOUND AND Nepomuk_FOUND) +endif(Soprano_FOUND AND Nepomuk_FOUND AND SMOKE_NEPOMUK_FOUND) macro_optional_add_bindings(BUILD_Nepomuk "Nepomuk" nepomuk) -macro_optional_add_bindings(OKULAR_FOUND "Okular" okular) +if(OKULAR_FOUND AND SMOKE_OKULAR_FOUND) + set(BUILD_Okular TRUE) +else(OKULAR_FOUND AND SMOKE_OKULAR_FOUND) + set(BUILD_Okular FALSE) +endif(OKULAR_FOUND AND SMOKE_OKULAR_FOUND) +macro_optional_add_bindings(BUILD_Okular "Okular" okular) find_library(KATEINTERFACES_LIBRARY kateinterfaces HINTS ${KDE4_LIB_DIR}) find_path(KATE_INCLUDE_DIR kate/plugin.h HINTS ${KDE4_INCLUDE_DIR}) -macro_optional_add_bindings(KATE_INCLUDE_DIR "Kate" kate) +if(KATE_INCLUDE_DIR AND SMOKE_KATE_FOUND) + set(BUILD_Kate TRUE) +else(KATE_INCLUDE_DIR AND SMOKE_KATE_FOUND) + set(BUILD_Kate FALSE) +endif(KATE_INCLUDE_DIR AND SMOKE_KATE_FOUND) +macro_optional_add_bindings(BUILD_Kate "Kate" kate) macro_display_bindings_log() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/korundum-4.10.4/modules/akonadi/CMakeLists.txt new/korundum-4.10.90/modules/akonadi/CMakeLists.txt --- old/korundum-4.10.4/modules/akonadi/CMakeLists.txt 2013-05-28 20:43:50.000000000 +0200 +++ new/korundum-4.10.90/modules/akonadi/CMakeLists.txt 2013-06-10 20:51:51.000000000 +0200 @@ -8,7 +8,7 @@ target_link_libraries(rubyakonadi ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} - smokeakonadi + ${SMOKE_AKONADI_LIBRARY} ${SMOKE_BASE_LIBRARY} ${QTRUBY4SHARED_LIBRARY} ${RUBY_LIBRARY} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/korundum-4.10.4/modules/kate/CMakeLists.txt new/korundum-4.10.90/modules/kate/CMakeLists.txt --- old/korundum-4.10.4/modules/kate/CMakeLists.txt 2013-05-28 20:43:50.000000000 +0200 +++ new/korundum-4.10.90/modules/kate/CMakeLists.txt 2013-06-10 20:51:51.000000000 +0200 @@ -11,7 +11,7 @@ target_link_libraries(kate ${QTRUBY4SHARED_LIBRARY} - smokekate + ${SMOKE_KATE_LIBRARY} ${SMOKE_BASE_LIBRARY} ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/korundum-4.10.4/modules/nepomuk/CMakeLists.txt new/korundum-4.10.90/modules/nepomuk/CMakeLists.txt --- old/korundum-4.10.4/modules/nepomuk/CMakeLists.txt 2013-05-28 20:43:50.000000000 +0200 +++ new/korundum-4.10.90/modules/nepomuk/CMakeLists.txt 2013-06-10 20:51:51.000000000 +0200 @@ -7,7 +7,7 @@ target_link_libraries(rubynepomuk ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES} - smokenepomuk + ${SMOKE_NEPOMUK_LIBRARY} ${SMOKE_BASE_LIBRARY} ${SMOKE_QTCORE_LIBRARY} ${QTRUBY4SHARED_LIBRARY} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/korundum-4.10.4/modules/okular/CMakeLists.txt new/korundum-4.10.90/modules/okular/CMakeLists.txt --- old/korundum-4.10.4/modules/okular/CMakeLists.txt 2013-05-28 20:43:50.000000000 +0200 +++ new/korundum-4.10.90/modules/okular/CMakeLists.txt 2013-06-10 20:51:51.000000000 +0200 @@ -6,7 +6,7 @@ add_library(rubyokular MODULE ${rubyokular_LIBRARY_SRC}) target_link_libraries(rubyokular ${OKULAR_LIBRARIES} - smokeokular + ${SMOKE_OKULAR_LIBRARY} ${QTRUBY4SHARED_LIBRARY} ${RUBY_LIBRARY} ${QT_QTCORE_LIBRARY} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/korundum-4.10.4/src/krubypluginfactory.cpp new/korundum-4.10.90/src/krubypluginfactory.cpp --- old/korundum-4.10.4/src/krubypluginfactory.cpp 2013-05-28 20:43:50.000000000 +0200 +++ new/korundum-4.10.90/src/krubypluginfactory.cpp 2013-06-25 20:21:27.000000000 +0200 @@ -39,7 +39,6 @@ extern "C" { extern VALUE rb_load_path; extern VALUE qt_internal_module; -void Init_prelude(void); } // @@ -165,7 +164,8 @@ #if RUBY_VERSION >= 0x10900 VALUE gem = rb_define_module("Gem"); rb_const_set(gem, rb_intern("Enable"), Qtrue); - Init_prelude(); + char *opts[] = { "ruby", "-e;" }; + ruby_options(2, opts); #endif ruby_incpush(QFile::encodeName(program.path())); @@ -342,7 +342,8 @@ #if RUBY_VERSION >= 0x10900 VALUE gem = rb_define_module("Gem"); rb_const_set(gem, rb_intern("Enable"), Qtrue); - Init_prelude(); + char *opts[] = { "ruby", "-e;" }; + ruby_options(2, opts); #endif ruby_incpush(QFile::encodeName(program.path())); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
