Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pan for openSUSE:Factory checked in
at 2024-04-29 17:57:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pan (Old)
and /work/SRC/openSUSE:Factory/.pan.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pan"
Mon Apr 29 17:57:48 2024 rev:22 rq:1170628 version:0.158
Changes:
--------
--- /work/SRC/openSUSE:Factory/pan/pan.changes 2024-04-07 22:13:16.130561182
+0200
+++ /work/SRC/openSUSE:Factory/.pan.new.1880/pan.changes 2024-04-29
17:57:51.914321404 +0200
@@ -1,0 +2,11 @@
+Sun Apr 28 19:08:31 UTC 2024 - Dirk Müller <dmuel...@suse.com>
+
+- update to 0.158:
+ * add doc for cmake build options
+ * fix cmake install de-install doc
+ * fix ctest instructions
+ * cmake: set WANT_GMIME_CRYPTO option to default off
+ * cmake: install help and man files
+ * cmake: install translations files as pan.mo
+
+-------------------------------------------------------------------
Old:
----
pan-v0.157.tar.bz2
New:
----
pan-v0.158.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pan.spec ++++++
--- /var/tmp/diff_new_pack.f6jCmf/_old 2024-04-29 17:57:52.786353121 +0200
+++ /var/tmp/diff_new_pack.f6jCmf/_new 2024-04-29 17:57:52.790353266 +0200
@@ -17,7 +17,7 @@
Name: pan
-Version: 0.157
+Version: 0.158
Release: 0
Summary: A Newsreader for GNOME
License: GPL-2.0-or-later
++++++ pan-v0.157.tar.bz2 -> pan-v0.158.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pan-v0.157/.gitlab-ci.yml
new/pan-v0.158/.gitlab-ci.yml
--- old/pan-v0.157/.gitlab-ci.yml 2024-04-01 18:09:09.000000000 +0200
+++ new/pan-v0.158/.gitlab-ci.yml 2024-04-13 17:32:46.000000000 +0200
@@ -50,6 +50,7 @@
cmake
gettext
gcc
+ itstool
libglib2.0-dev-bin
libdbus-1-dev
libgcr-3-dev
@@ -60,7 +61,6 @@
libsecret-1-dev
libgtkspell3-3-dev
libenchant-2-dev
- yelp-tools
script:
- mkdir $BUILD_DIR
- >-
@@ -72,6 +72,33 @@
-B $BUILD_DIR
- cmake --build $BUILD_DIR
+cmake-ubuntu-bare-bones:
+ image: ubuntu:rolling
+ stage: build
+ variables:
+ BUILD_DIR: cmake-build
+ except:
+ - tags
+ before_script:
+ - apt-get update
+ - apt-get install -q -y --no-install-recommends
+ build-essential
+ cmake
+ gettext
+ gcc
+ libglib2.0-dev-bin
+ libgmime-3.0-dev
+ libgtk-3-dev
+ libsecret-1-dev
+ script:
+ - mkdir $BUILD_DIR
+ - >-
+ cmake
+ -D WANT_GNUTLS=off
+ -D WANT_GTKSPELL=off
+ -B $BUILD_DIR
+ - cmake --build $BUILD_DIR
+
build-ubuntu-gtk3-bare-bones:
image: ubuntu:rolling
stage: build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pan-v0.157/CMakeLists.txt
new/pan-v0.158/CMakeLists.txt
--- old/pan-v0.157/CMakeLists.txt 2024-04-01 18:09:09.000000000 +0200
+++ new/pan-v0.158/CMakeLists.txt 2024-04-13 17:32:46.000000000 +0200
@@ -6,11 +6,11 @@
# https://cmake.org/cmake/help/latest/command/project.html
project(Pan
- VERSION 0.157
+ VERSION 0.158
DESCRIPTION "Pan usenet reader"
HOMEPAGE_URL "https://gitlab.gnome.org/GNOME/pan";
)
-set(VERSION_TITLE "Mariinka")
+set(VERSION_TITLE "Avdiivka")
# Standard CMake modules
include(CTest)
@@ -77,19 +77,6 @@
check_symbol_exists(close "unistd.h" HAVE_CLOSE)
check_symbol_exists(localtime_r "time.h" HAVE_LOCALTIME_R)
-# see https://cmake.org/cmake/help/latest/module/FindGettext.html
-find_package(Gettext)
-file(STRINGS "po/LINGUAS" lang_list REGEX "^[a-z]")
-foreach(lang IN LISTS lang_list)
- # this creates the gmo file in build directory instead of po/*.gmo. Although
this is
- # a change from previous build system, it may not be a problem
- GETTEXT_PROCESS_PO_FILES(
- ${lang} ALL
- INSTALL_DESTINATION "share/locale"
- PO_FILES "${CMAKE_SOURCE_DIR}/po/${lang}.po"
- )
-endforeach()
-add_dependencies(pan pofiles)
set(GETTEXT_PACKAGE pan)
find_package(PkgConfig REQUIRED)
@@ -145,7 +132,7 @@
list(APPEND libraries_for_pan ${GLIB_LIBRARIES})
# Check for GMime cryptography support
-option(WANT_GMIME_CRYPTO "enable GMime cryptography support (default: on)" ON)
+option(WANT_GMIME_CRYPTO "enable GMime cryptography support (default: no)")
if(WANT_GMIME_CRYPTO)
set(HAVE_GMIME_CRYPTO TRUE)
endif()
@@ -197,12 +184,9 @@
endif()
# not sure that yelp is working right now
-option(WANT_YELP_TOOLS "enable yelp-tools support for documentation (default:
off)")
option(ENABLE_MANUAL "built in user manual (default: off)")
-if(WANT_YELP-TOOLS)
- if (ENABLE_MANUAL)
- set(HAVE_MANUAL 1)
- endif()
+if (ENABLE_MANUAL)
+ set(HAVE_MANUAL 1)
endif()
# Check to see if strftime supports the use of %l and %k
@@ -246,6 +230,8 @@
# https://cmake.org/cmake/help/latest/command/add_subdirectory.html
add_subdirectory(uulib)
add_subdirectory(pan)
+add_subdirectory(po)
+add_subdirectory(help)
# https://cmake.org/cmake/help/latest/command/configure_file.html
configure_file(${CMAKE_SOURCE_DIR}/config-cmake.h.in
${CMAKE_BINARY_DIR}/config.h)
@@ -292,3 +278,8 @@
FILES "${CMAKE_CURRENT_BINARY_DIR}/${desktop}"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
)
+
+# install pan man page
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/man1")
+file(COPY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/pan.1"
"${CMAKE_CURRENT_BINARY_DIR}/man1/pan.1")
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/man1" TYPE MAN)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pan-v0.157/NEWS new/pan-v0.158/NEWS
--- old/pan-v0.157/NEWS 2024-04-01 18:09:09.000000000 +0200
+++ new/pan-v0.158/NEWS 2024-04-13 17:32:46.000000000 +0200
@@ -1,3 +1,19 @@
+0.158 "Avdiivka" (ÐвдÑÑвка) 2024-04-13
+
+* The main changes of this release are:
+ * README.org:
+ * add doc for cmake build options
+ * fix cmake install de-install doc
+ * fix ctest instructions
+ * cmake: set WANT_GMIME_CRYPTO option to default off
+ * cmake: install help and man files
+ * cmake: install translations files as pan.mo
+
+* Contributors to this release:
+ Dominique Dumont
+
+Many thanks to Atri Bhattacharya for the help on cmake
+
0.157 "Mariinka" (ÐаÑÑнка) - 2024-04-01
* The main changes of this release are:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pan-v0.157/README.org new/pan-v0.158/README.org
--- old/pan-v0.157/README.org 2024-04-01 18:09:09.000000000 +0200
+++ new/pan-v0.158/README.org 2024-04-13 17:32:46.000000000 +0200
@@ -120,19 +120,39 @@
Optionally, run tests (even if they are few of them):
#+BEGIN_SRC shell :results verbatim
- ctest --test-dir build
+ ctest --test-dir std-build
#+END_SRC
*** Installation
To install pan:
#+BEGIN_SRC shell :results verbatim
- cmake --install build
+ cmake --install std-build
#+END_SRC
Uninstall pan (see
[[https://stackoverflow.com/questions/41471620/cmake-support-make-uninstall#44649542][Stack
Overflow link]] for details):
#+BEGIN_SRC shell :results verbatim
- xargs rm < build/install_manifest.txt
+ xargs rm < std-build/install_manifest.txt
+#+END_SRC
+
+*** Build options
+
+Pan can be build with several options:
+
+| option | usage | default |
+|---------------+-------------------------------------------+---------|
+| ENABLE_MANUAL | built in user manual | off |
+| WANT_DBUS | enable D-Bus support | off |
+| WANT_GKR | enable GNOME Keyring or libsecret support | off |
+| WANT_GMIME | enable GMime cryptography support | off |
+| WANT_GNUTLS | enable GnuTLS support | on |
+| WANT_GTKSPELL | enable GtkSpell support | on |
+| WANT_NOTIFY | enable libnotify support | off |
+
+These options can be listed with the following command:
+
+#+BEGIN_SRC shell :results verbatim :eval no
+ cmake -B std-build -LH
#+END_SRC
*** Debug build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pan-v0.157/configure.ac new/pan-v0.158/configure.ac
--- old/pan-v0.157/configure.ac 2024-04-01 18:09:09.000000000 +0200
+++ new/pan-v0.158/configure.ac 2024-04-13 17:32:46.000000000 +0200
@@ -1,12 +1,12 @@
-AC_INIT([Pan],[0.157],[https://gitlab.gnome.org/GNOME/pan/issues],[pan],[https://gitlab.gnome.org/GNOME/pan])
+AC_INIT([Pan],[0.158],[https://gitlab.gnome.org/GNOME/pan/issues],[pan],[https://gitlab.gnome.org/GNOME/pan])
AC_DEFINE(VERSION_MAJOR,0,[Major part of version number])
-AC_DEFINE(VERSION_MINOR,157,[Minor part of version number])
+AC_DEFINE(VERSION_MINOR,158,[Minor part of version number])
AC_DEFINE(VERSION_REVISION,0,[Revision part of version number])
-AC_DEFINE(VERSION_TITLE,["Mariinka"],[Release Name])
+AC_DEFINE(VERSION_TITLE,["Avdiivka"],[Release Name])
AC_PREREQ([2.71])
dnl Get git info for pan-git.version
-GIT_HASH='7c3c6087'
+GIT_HASH='6a11104e'
if test ! '0' \< $GIT_HASH ; then
dnl git-dir is used for building outside the src tree
GIT_HASH=`git --git-dir=$srcdir/.git log -1 --pretty=format:%h 2> /dev/null`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pan-v0.157/help/CMakeLists.txt
new/pan-v0.158/help/CMakeLists.txt
--- old/pan-v0.157/help/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/pan-v0.158/help/CMakeLists.txt 2024-04-13 17:32:46.000000000 +0200
@@ -0,0 +1,41 @@
+# need to build docbook
+# see
https://build.opensuse.org/package/live_build_log/openSUSE:Factory/pan/standard/x86_64
+
+if (ENABLE_MANUAL)
+
+ # https://cmake.org/cmake/help/latest/command/find_program.html
+ find_program(has_itstool NAMES itstool REQUIRED)
+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/C/figures")
+ set(png_path "figures/pan_window.png")
+ file(COPY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/C/${png_path}"
"${CMAKE_CURRENT_BINARY_DIR}/C/${png_path}")
+ file(COPY_FILE "${CMAKE_CURRENT_SOURCE_DIR}/C/index.docbook"
"${CMAKE_CURRENT_BINARY_DIR}/C/index.docbook")
+
+ set(lang_list cs de es sv)
+ foreach(lang IN LISTS lang_list)
+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${lang}/figures")
+ add_custom_target(
+ "${lang}-docbook" ALL
+ BYPRODUCTS "${lang}/${lang}.mo"
+ DEPENDS "${lang}/${lang}.po"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${lang}"
+ COMMAND msgfmt -o "${lang}.mo"
"${CMAKE_CURRENT_SOURCE_DIR}/${lang}/${lang}.po"
+ COMMAND itstool -m "${lang}.mo"
"${CMAKE_CURRENT_SOURCE_DIR}/C/index.docbook"
+ )
+ file(CREATE_LINK "../../../C/pan/${png_path}"
"${CMAKE_CURRENT_BINARY_DIR}/${lang}/${png_path}" SYMBOLIC)
+ endforeach()
+
+ foreach(lang IN LISTS lang_list ITEMS C)
+ # https://cmake.org/cmake/help/latest/command/install.html#files
+ install(
+ FILES "${CMAKE_CURRENT_BINARY_DIR}/${lang}/index.docbook"
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/help/${lang}/pan/"
+ )
+ install(
+ FILES "${CMAKE_CURRENT_BINARY_DIR}/${lang}/${png_path}"
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/help/${lang}/pan/figures"
+ )
+ endforeach()
+
+ install(FILES "C/legal.xml" DESTINATION
"${CMAKE_INSTALL_DATAROOTDIR}/help/C/pan/")
+
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pan-v0.157/pan/gui/gui.cc
new/pan-v0.158/pan/gui/gui.cc
--- old/pan-v0.157/pan/gui/gui.cc 2024-04-01 18:09:09.000000000 +0200
+++ new/pan-v0.158/pan/gui/gui.cc 2024-04-13 17:32:46.000000000 +0200
@@ -1631,7 +1631,7 @@
void GUI :: do_pan_manual ()
{
GError * error (NULL);
- gtk_show_uri (NULL, "help:pan", gtk_get_current_event_time (), &error);
+ gtk_show_uri_on_window (NULL, "help:pan", gtk_get_current_event_time (),
&error);
if (error) {
GtkWidget * w = gtk_message_dialog_new (get_window(_root),
GtkDialogFlags(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pan-v0.157/pan/usenet-utils/CMakeLists.txt
new/pan-v0.158/pan/usenet-utils/CMakeLists.txt
--- old/pan-v0.157/pan/usenet-utils/CMakeLists.txt 2024-04-01
18:09:09.000000000 +0200
+++ new/pan-v0.158/pan/usenet-utils/CMakeLists.txt 2024-04-13
17:32:46.000000000 +0200
@@ -13,15 +13,19 @@
gpg.cc
)
-# Sanity checking
-# https://cmake.org/cmake/help/latest/command/add_compile_options.html
-target_compile_options(usenet-utils PRIVATE "${CXX_STD}" "-Wreorder"
"-Wzero-as-null-pointer-constant")
# TODO: fix message-check-test and add it to this list
set(test-programs gnksa-test numbers-test scorefile-test text-massager-test
url-find-test)
foreach(test ${test-programs})
add_executable(${test} ${test}.cc)
- target_link_libraries(${test} usenet-utils generalutils ${GMIME_LIBRARIES}
${GLIB_LIBRARIES})
+ # Sanity checking
+ # https://cmake.org/cmake/help/latest/command/add_compile_options.html
+ target_compile_options(${test} PRIVATE "${CXX_STD}" "-Wreorder"
"-Wzero-as-null-pointer-constant")
+ if(HAVE_GNUTLS)
+ target_link_libraries(${test} usenet-utils generalutils pan-cc-gui
${GMIME_LIBRARIES} ${GLIB_LIBRARIES} ${GNUTLS_LIBRARIES})
+ else()
+ target_link_libraries(${test} usenet-utils generalutils pan-cc-gui
${GMIME_LIBRARIES} ${GLIB_LIBRARIES})
+ endif()
add_test(NAME ${test}-test COMMAND ${test})
endforeach()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pan-v0.157/po/CMakeLists.txt
new/pan-v0.158/po/CMakeLists.txt
--- old/pan-v0.157/po/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/pan-v0.158/po/CMakeLists.txt 2024-04-13 17:32:46.000000000 +0200
@@ -0,0 +1,17 @@
+# see https://cmake.org/cmake/help/latest/module/FindGettext.html
+find_package(Gettext)
+file(STRINGS "${CMAKE_SOURCE_DIR}/po/LINGUAS" lang_list REGEX "^[a-z]")
+foreach(lang IN LISTS lang_list)
+ # this creates the gmo file in build directory instead of po/*.gmo. Although
this is
+ # a change from previous build system, it may not be a problem
+ GETTEXT_PROCESS_PO_FILES(
+ ${lang} ALL
+ PO_FILES "${CMAKE_SOURCE_DIR}/po/${lang}.po"
+ )
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo
+ DESTINATION "${CMAKE_INSTALL_LOCALEDIR}/${lang}/LC_MESSAGES/"
+ RENAME pan.mo
+ )
+endforeach()
+add_dependencies(pan pofiles)
+
