Page MenuHomeSolus

D8919.id21471.diff
No OneTemporary

D8919.id21471.diff

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,15 +1,21 @@
libc.so.6
libcairo.so.2
+libcurl.so.4
libgcc_s.so.1
libgdk-3.so.0
libgee-0.8.so.2
libgio-2.0.so.0
libglib-2.0.so.0
+libgmp.so.10
libgobject-2.0.so.0
libgranite.so.5
libgtk-3.so.0
libgtksourceview-3.0.so.1
+libicuuc.so.65
+libm.so.6
+libmpfr.so.6
libpango-1.0.so.0
-libqalculate.so.19
+libpthread.so.0
libsoup-2.4.so.1
libstdc++.so.6
+libxml2.so.2
diff --git a/files/0001-Don-t-compile-icon-cache.patch b/files/0001-Don-t-compile-icon-cache.patch
deleted file mode 100644
--- a/files/0001-Don-t-compile-icon-cache.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8e9e9d341f7cf5a17dfaa0a7ec8881c39cd08bb6 Mon Sep 17 00:00:00 2001
-From: Peter O'Connor <peter@solus-project.com>
-Date: Sat, 24 Mar 2018 18:52:35 +1100
-Subject: [PATCH] Don't compile icon cache...
-
-Signed-off-by: Peter O'Connor <peter@solus-project.com>
----
- CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 31264f6..8bf2e74 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -134,9 +134,6 @@ install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/styles DESTINATION share/qal
- # install (CODE
- # "execute_process (COMMAND rm /usr/share/qalculate/datasetsNasc.xml)"
- # )
--install (CODE
-- "execute_process (COMMAND gtk-update-icon-cache /usr/share/icons/hicolor)"
--)
-
- # uninstall target
- configure_file(
---
-2.16.3
-
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : nasc
-version : 0.5.4
-release : 19
+version : 0.6.1
+release : 20
source :
- - https://github.com/parnold-x/nasc/archive/0.5.4.tar.gz : eba0d00d33dba7fc7a93b55d16ef769fe87839c9660d2a43e28e7fdd37a7cff5
+ - git|https://github.com/parnold-x/nasc: 0.6.1
license : GPL-3.0-or-later
component : office.maths
libsplit : no
@@ -12,14 +12,14 @@
builddeps :
- pkgconfig(granite)
- pkgconfig(gtksourceview-3.0)
+ - pkgconfig(libcurl)
- pkgconfig(libqalculate)
- pkgconfig(libsoup-2.4)
- cln-devel
- vala
setup : |
- %patch -p1 < $pkgfiles/0001-Don-t-compile-icon-cache.patch
- %cmake -DGSETTINGS_COMPILE=OFF .
+ %meson_configure
build : |
- %make
+ %ninja_build
install : |
- %make_install
+ %ninja_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>nasc</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>Alec Scott</Name>
+ <Email>alecbcs@gmail.com</Email>
</Packager>
<License>GPL-3.0-or-later</License>
<PartOf>office.maths</PartOf>
@@ -29,22 +29,22 @@
<Path fileType="data">/usr/share/icons/hicolor/48x48/apps/com.github.parnold-x.nasc.svg</Path>
<Path fileType="data">/usr/share/icons/hicolor/64x64/apps/com.github.parnold-x.nasc.svg</Path>
<Path fileType="data">/usr/share/metainfo/com.github.parnold-x.nasc.appdata.xml</Path>
- <Path fileType="data">/usr/share/qalculate/styles/def.lang</Path>
- <Path fileType="data">/usr/share/qalculate/styles/language.dtd</Path>
- <Path fileType="data">/usr/share/qalculate/styles/language.rng</Path>
- <Path fileType="data">/usr/share/qalculate/styles/language2.rng</Path>
- <Path fileType="data">/usr/share/qalculate/styles/nasc.lang</Path>
- <Path fileType="data">/usr/share/qalculate/styles/nasc.xml</Path>
- <Path fileType="data">/usr/share/qalculate/styles/styles.rng</Path>
+ <Path fileType="data">/usr/share/nasc/styles/def.lang</Path>
+ <Path fileType="data">/usr/share/nasc/styles/language.dtd</Path>
+ <Path fileType="data">/usr/share/nasc/styles/language.rng</Path>
+ <Path fileType="data">/usr/share/nasc/styles/language2.rng</Path>
+ <Path fileType="data">/usr/share/nasc/styles/nasc.lang</Path>
+ <Path fileType="data">/usr/share/nasc/styles/nasc.xml</Path>
+ <Path fileType="data">/usr/share/nasc/styles/styles.rng</Path>
</Files>
</Package>
<History>
- <Update release="19">
- <Date>2020-03-13</Date>
- <Version>0.5.4</Version>
+ <Update release="20">
+ <Date>2020-05-21</Date>
+ <Version>0.6.1</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>Alec Scott</Name>
+ <Email>alecbcs@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 10, 7:21 PM (1 d, 3 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5813531
Default Alt Text
D8919.id21471.diff (4 KB)

Event Timeline