diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -22,7 +22,6 @@ libdbus-1.so.3 libdl.so.2 libexpat.so.1 -libfontconfig.so.1 libgcc_s.so.1 libgdk-3.so.0 libgdk_pixbuf-2.0.so.0 @@ -42,6 +41,7 @@ libsmime3.so libssl.so.1.0.0 libstdc++.so.6 +libuuid.so.1 libxcb.so.1 libxkbfile.so.1 libz.so.1 diff --git a/files/0001-Revert-git-utils-to-5.5.0-to-fix-undefined-symbols-o.patch b/files/0001-Revert-git-utils-to-5.5.0-to-fix-undefined-symbols-o.patch deleted file mode 100644 --- a/files/0001-Revert-git-utils-to-5.5.0-to-fix-undefined-symbols-o.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3da860fdaf795b31f1a614a052b12bff45dd29b9 Mon Sep 17 00:00:00 2001 -From: Joshua Strobl -Date: Thu, 12 Sep 2019 10:05:33 +0300 -Subject: [PATCH 1/1] Revert git-utils to 5.5.0 to fix undefined symbols on - project indexing. - ---- - package.json | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/package.json b/package.json -index 2f2367dea..f03a19d8d 100644 ---- a/package.json -+++ b/package.json -@@ -64,7 +64,7 @@ - "fuzzaldrin": "^2.1", - "fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.14.0/tarball", - "git-diff": "file:packages/git-diff", -- "git-utils": "5.6.1", -+ "git-utils": "5.5.0", - "github": "https://www.atom.io/api/packages/github/versions/0.30.0/tarball", - "glob": "^7.1.1", - "go-to-line": "file:packages/go-to-line", --- -2.23.0 - diff --git a/files/0001-fix-file-indexing.patch b/files/0001-fix-file-indexing.patch new file mode 100644 --- /dev/null +++ b/files/0001-fix-file-indexing.patch @@ -0,0 +1,43 @@ +From 837ff394a72f3ceb42febcca596a3665f4cf1b27 Mon Sep 17 00:00:00 2001 +From: Jacob +Date: Wed, 23 Oct 2019 20:03:21 +0200 +Subject: [PATCH] Revert git-utils to 5.5.0 in package.json + +--- + package-lock.json | 6 +++--- + package.json | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/package-lock.json b/package-lock.json +index 79c6c314b..da125eb44 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -3201,9 +3201,9 @@ + } + }, + "git-utils": { +- "version": "5.6.1", +- "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.6.1.tgz", +- "integrity": "sha512-wDF7vSbH940NupuMFC87As0x/VSke51P7xTnkdSlk96YN3tzOagXzBUNq5Nq16KOVuMSxcGj1l3qHF5VXl39Ng==", ++ "version": "5.5.0", ++ "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.5.0.tgz", ++ "integrity": "sha512-4t3f2pU4HPgKOyTXyaEdMHTBwa24ubC4FykCXlqnsPgHlupSq66d0/aq0h92BgnyGwI3ogqx9D0a+Uw/jNckOg==", + "requires": { + "fs-plus": "^3.0.0", + "nan": "^2.0.0" +diff --git a/package.json b/package.json +index 604b99b2d..bce56ff50 100644 +--- a/package.json ++++ b/package.json +@@ -64,7 +64,7 @@ + "fuzzaldrin": "^2.1", + "fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.14.0/tarball", + "git-diff": "file:packages/git-diff", +- "git-utils": "5.6.1", ++ "git-utils": "5.5.0", + "github": "https://www.atom.io/api/packages/github/versions/0.30.1/tarball", + "glob": "^7.1.1", + "go-to-line": "file:packages/go-to-line", +-- +2.23.0 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : atom -version : 1.40.1 -release : 126 +version : 1.41.0 +release : 127 source : - - https://github.com/atom/atom/archive/v1.40.1.tar.gz : 7ec4b3fd35d3dcb4df90911726144ca5d05335ee9c0f093f2c29fa22fbe3527a + - https://github.com/atom/atom/archive/v1.41.0.tar.gz : 4a440909462c461cbec9b82b5f97bd21719a34f0ab59f2d859df85a40246c949 license : MIT component : programming.ide summary : Atom is a hackable text editor for the 21st century. @@ -31,7 +31,7 @@ - curl-gnutls - git setup : | - %patch -p1 < $pkgfiles/0001-Revert-git-utils-to-5.5.0-to-fix-undefined-symbols-o.patch + %patch -p1 < $pkgfiles/0001-fix-file-indexing.patch build : | mkdir -p %installroot%/usr/bin/ script/build 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 @@ atom - Joshua Strobl - joshua@stroblindustries.com + Jacob Alzén + jacob.alzen@gmail.com MIT programming.ide @@ -25,12 +25,12 @@ /usr/share/atom/LICENSES.chromium.html /usr/share/atom/atom /usr/share/atom/atom.png - /usr/share/atom/blink_image_resources_200_percent.pak - /usr/share/atom/content_resources_200_percent.pak - /usr/share/atom/content_shell.pak + /usr/share/atom/chrome_100_percent.pak + /usr/share/atom/chrome_200_percent.pak /usr/share/atom/icudtl.dat + /usr/share/atom/libEGL.so + /usr/share/atom/libGLESv2.so /usr/share/atom/libffmpeg.so - /usr/share/atom/libnode.so /usr/share/atom/locales/am.pak /usr/share/atom/locales/ar.pak /usr/share/atom/locales/bg.pak @@ -46,7 +46,6 @@ /usr/share/atom/locales/es.pak /usr/share/atom/locales/et.pak /usr/share/atom/locales/fa.pak - /usr/share/atom/locales/fake-bidi.pak /usr/share/atom/locales/fi.pak /usr/share/atom/locales/fil.pak /usr/share/atom/locales/fr.pak @@ -86,6 +85,7 @@ /usr/share/atom/locales/zh-CN.pak /usr/share/atom/locales/zh-TW.pak /usr/share/atom/natives_blob.bin + /usr/share/atom/resources.pak /usr/share/atom/resources/app.asar /usr/share/atom/resources/app.asar.unpacked/node_modules/@atom/fuzzy-native/build/Release/fuzzy-native.node /usr/share/atom/resources/app.asar.unpacked/node_modules/@atom/nsfw/build/Release/nsfw.node @@ -4312,20 +4312,20 @@ /usr/share/atom/resources/app/atom.sh /usr/share/atom/resources/electron.asar /usr/share/atom/snapshot_blob.bin - /usr/share/atom/ui_resources_200_percent.pak + /usr/share/atom/swiftshader/libEGL.so + /usr/share/atom/swiftshader/libGLESv2.so /usr/share/atom/v8_context_snapshot.bin /usr/share/atom/version - /usr/share/atom/views_resources_200_percent.pak /usr/share/pixmaps/atom.png - - 2019-09-12 - 1.40.1 + + 2019-10-23 + 1.41.0 Packaging update - Joshua Strobl - joshua@stroblindustries.com + Jacob Alzén + jacob.alzen@gmail.com \ No newline at end of file