Hello community, here is the log from the commit of package nasc for openSUSE:Factory checked in at 2019-02-27 15:06:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nasc (Old) and /work/SRC/openSUSE:Factory/.nasc.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nasc" Wed Feb 27 15:06:59 2019 rev:5 rq:679478 version:0.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/nasc/nasc.changes 2018-12-04 20:56:37.488699772 +0100 +++ /work/SRC/openSUSE:Factory/.nasc.new.28833/nasc.changes 2019-02-27 15:07:05.950429652 +0100 @@ -1,0 +2,12 @@ +Mon Feb 18 14:42:03 UTC 2019 - Alexei Podvalsky <[email protected]> + +- Update to 0.5.2: + * CMake: Remove --thread option for Vala Compiler + * CMake: Fix linking + * Enhance AppData file + * Enhance desktop file + * Use get_user_data_dir() instead of hardcoded path + * Update control +- Drop nasc-0.5.0-link.patch (fixed) + +------------------------------------------------------------------- Old: ---- nasc-0.5.0-link.patch nasc-0.5.1.tar.gz New: ---- nasc-0.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nasc.spec ++++++ --- /var/tmp/diff_new_pack.TQ2PAa/_old 2019-02-27 15:07:06.766429403 +0100 +++ /var/tmp/diff_new_pack.TQ2PAa/_new 2019-02-27 15:07:06.766429403 +0100 @@ -17,15 +17,13 @@ Name: nasc -Version: 0.5.1 +Version: 0.5.2 Release: 0 Summary: Do maths like a normal person License: GPL-3.0-only Group: Productivity/Scientific/Math URL: http://parnold-x.github.io/nasc/ Source: https://github.com/parnold-x/nasc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM link.patch -- Build app with 'Wl,--no-undefined' and static library -Patch0: nasc-0.5.0-link.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -53,7 +51,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake \ ++++++ nasc-0.5.1.tar.gz -> nasc-0.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.5.1/CMakeLists.txt new/nasc-0.5.2/CMakeLists.txt --- old/nasc-0.5.1/CMakeLists.txt 2018-11-05 19:38:55.000000000 +0100 +++ new/nasc-0.5.2/CMakeLists.txt 2019-02-17 17:19:46.000000000 +0100 @@ -86,8 +86,10 @@ OPTIONS # --enable-experimental --target-glib=2.32 # Remember to keep this updated. - --thread - # -X -rdynamic + # The --thread option is now deprecated. + # Should be ignored, but actually it leads to a build failure. + # --thread + # -X -rdynamic # -g ) @@ -101,7 +103,8 @@ target_link_libraries(com.github.parnold-x.nasc ${QALCULATE_LIB_PATH} ${DEPS_LIBRARIES} - qalculatenasc) + qalculatenasc + -lcln) install (TARGETS com.github.parnold-x.nasc RUNTIME DESTINATION bin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.5.1/data/com.github.parnold-x.nasc.appdata.xml new/nasc-0.5.2/data/com.github.parnold-x.nasc.appdata.xml --- old/nasc-0.5.1/data/com.github.parnold-x.nasc.appdata.xml 2018-11-05 19:38:55.000000000 +0100 +++ new/nasc-0.5.2/data/com.github.parnold-x.nasc.appdata.xml 2019-02-17 17:19:46.000000000 +0100 @@ -12,21 +12,30 @@ <provides> <binary>com.github.parnold-x.nasc</binary> </provides> + <launchable type="desktop-id">com.github.parnold-x.nasc.desktop</launchable> <releases> - <release version="0.5.0" date="2018-20-28"> + <release version="0.5.1" date="2018-11-05"> <description> - <p>Release for Juno</p> + <p>Update Debian control file.</p> + </description> + </release> + <release version="0.5.0" date="2018-10-28"> + <description> + <p>Release for Juno.</p> </description> </release> </releases> <screenshots> <screenshot type="default"> + <caption>Main view</caption> <image>https://raw.githubusercontent.com/parnold-x/nasc/master/Screenshot.png</image> </screenshot> <screenshot> + <caption>Help pane</caption> <image>https://raw.githubusercontent.com/parnold-x/nasc/master/Screenshot2.png</image> </screenshot> <screenshot> + <caption>Periodic table</caption> <image>https://raw.githubusercontent.com/parnold-x/nasc/master/Screenshot3.png</image> </screenshot> </screenshots> @@ -63,9 +72,15 @@ <url type="homepage">https://github.com/parnold-x/nasc</url> <url type="bugtracker">https://github.com/parnold-x/nasc/issues</url> <url type="help">https://github.com/parnold-x/nasc/issues</url> + <kudos> + <kudo>HiDpiIcon</kudo> + <kudo>HighContrast</kudo> + <kudo>ModernToolkit</kudo> + <kudo>UserDocs</kudo> + </kudos> <custom> - <value key="x-appcenter-color-primary">#3278cd</value> - <value key="x-appcenter-color-primary-text">rgb(157, 200, 236)</value> + <value key="x-appcenter-color-primary">#3278cd</value> + <value key="x-appcenter-color-primary-text">rgb(157, 200, 236)</value> <value key="x-appcenter-suggested-price">8</value> </custom> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.5.1/data/com.github.parnold-x.nasc.desktop new/nasc-0.5.2/data/com.github.parnold-x.nasc.desktop --- old/nasc-0.5.1/data/com.github.parnold-x.nasc.desktop 2018-11-05 19:38:55.000000000 +0100 +++ new/nasc-0.5.2/data/com.github.parnold-x.nasc.desktop 2019-02-17 17:19:46.000000000 +0100 @@ -2,12 +2,14 @@ Type=Application Name=NaSC Comment=Do maths like a normal person -GenericName=NaSC +GenericName=Desktop calculator TryExec=com.github.parnold-x.nasc Exec=com.github.parnold-x.nasc Icon=com.github.parnold-x.nasc +StartupWMClass=nasc +StartupNotify=true Terminal=false -Categories=Utility;Calculator;Education;Science; +Categories=Utility;Calculator;Education;Math; Actions=AboutDialog; [Desktop Action AboutDialog] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.5.1/libqalculatenasc/CMakeLists.txt new/nasc-0.5.2/libqalculatenasc/CMakeLists.txt --- old/nasc-0.5.1/libqalculatenasc/CMakeLists.txt 2018-11-05 19:38:55.000000000 +0100 +++ new/nasc-0.5.2/libqalculatenasc/CMakeLists.txt 2019-02-17 17:19:46.000000000 +0100 @@ -1,7 +1,7 @@ pkg_check_modules(QALC REQUIRED libqalculate) link_directories(${QALC_LIBRARY_DIRS}) include_directories(${QALC_INCLUDE_DIRS}) - add_library(qalculatenasc SHARED + add_library(qalculatenasc STATIC QalculateNasc.cc) -target_link_libraries(qalculatenasc ${QALC_LIBRARIES}) +target_link_libraries(qalculatenasc ${QALC_LIBRARIES} -lcln) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.5.1/src/Controller.vala new/nasc-0.5.2/src/Controller.vala --- old/nasc-0.5.1/src/Controller.vala 2018-11-05 19:38:55.000000000 +0100 +++ new/nasc-0.5.2/src/Controller.vala 2019-02-17 17:19:46.000000000 +0100 @@ -45,8 +45,10 @@ public NascSheet actual_sheet { get; private set; } private Gee.LinkedList<NascSheet> removal_list; - private string sheet_path = Environment.get_home_dir () - + NascSettings.sheet_path + "nasc.sheets"; + private string sheet_base = Path.build_filename ( + Environment.get_user_data_dir(), + NascSettings.sheet_dir); + private string sheet_path; private string _sheets; public string sheets_file { @@ -93,6 +95,7 @@ public signal void periodic (); public Controller (InputView input, ResultView results) { + this.sheet_path = Path.build_filename (this.sheet_base, "nasc.sheets"); this.enable_calc = input.operators; this.removal_list = new Gee.LinkedList<NascSheet> (); /* add " to " to enable_calc list to allow variable to other unit conversion */ @@ -142,8 +145,7 @@ if (!file.query_exists ()) { try { - var dir = File.new_for_path (Environment.get_home_dir () - + NascSettings.sheet_path); + var dir = File.new_for_path (sheet_base); if (!dir.query_exists ()) { dir.make_directory (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nasc-0.5.1/src/NascSettings.vala new/nasc-0.5.2/src/NascSettings.vala --- old/nasc-0.5.1/src/NascSettings.vala 2018-11-05 19:38:55.000000000 +0100 +++ new/nasc-0.5.2/src/NascSettings.vala 2019-02-17 17:19:46.000000000 +0100 @@ -24,7 +24,7 @@ public const string variable_names = "nasc_line_"; public const string sheet_split_char = "|§§|"; public const string name_split_char = "-§-"; - public const string sheet_path = "/.local/share/nasc/"; + public const string sheet_dir = "nasc"; public bool show_tutorial { get; set; } public bool advanced_mode { get; set; }
