diff --git a/files/0001-linux-don-t-build-a-deb-or-rpm-please.patch b/files/0001-linux-don-t-build-a-deb-or-rpm-please.patch new file mode 100644 --- /dev/null +++ b/files/0001-linux-don-t-build-a-deb-or-rpm-please.patch @@ -0,0 +1,25 @@ +From 83833cb0e2180863f4a5f9b4d8f2ec6bd7571a65 Mon Sep 17 00:00:00 2001 +From: Joey Riches +Date: Wed, 22 Nov 2017 01:49:31 +0000 +Subject: [PATCH 1/1] linux: don't build a deb or rpm please + +Signed-off-by: Joey Riches +--- + app/build/Gruntfile.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/app/build/Gruntfile.js b/app/build/Gruntfile.js +index ca5a50c3d..c49f61fa4 100644 +--- a/app/build/Gruntfile.js ++++ b/app/build/Gruntfile.js +@@ -71,6 +71,6 @@ module.exports = grunt => { + } else if (grunt.option('platform') === 'darwin') { + grunt.registerTask('build-client', ['package', 'create-mac-zip', 'create-mac-dmg']); + } else if (grunt.option('platform') === 'linux') { +- grunt.registerTask('build-client', ['package', 'create-deb-installer', 'create-rpm-installer']); ++ grunt.registerTask('build-client', ['package']); + } + }; +-- +2.15.0 + diff --git a/files/0002-do-not-check-git-history.patch b/files/0002-do-not-check-git-history.patch new file mode 100644 --- /dev/null +++ b/files/0002-do-not-check-git-history.patch @@ -0,0 +1,12 @@ +diff --git a/app/build/tasks/package-task.js b/app/build/tasks/package-task.js +index db1533dcc..14185cc9f 100644 +--- a/app/build/tasks/package-task.js ++++ b/app/build/tasks/package-task.js +@@ -221,7 +221,6 @@ module.exports = grunt => { + appBundleId: 'com.mailspring.mailspring', + afterCopy: [ + runCopyPlatformSpecificResources, +- runWriteCommitHashIntoPackage, + runCopySymlinkedPackages, + runTranspilers, + ], diff --git a/files/mailspring.desktop b/files/mailspring.desktop new file mode 100644 --- /dev/null +++ b/files/mailspring.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Mailspring +Comment=The best email app for people and teams at work +GenericName=Mailspring +Exec=/usr/bin/mailspring %U +Icon=mailspring +Type=Application +StartupNotify=true +StartupWMClass=Mailspring +Categories=GNOME;GTK;Network;Email; +Keywords=email;internet; +MimeType=x-scheme-handler/mailto;x-scheme-handler/mailspring; diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : mailspring -version : 1.6.1 -release : 23 +version : 1.6.2 +release : 24 source : - - https://github.com/Foundry376/Mailspring/releases/download/1.6.1/mailspring-1.6.1-amd64.deb : f68cd607daf27375a13ec371505a714af6eda663d79f58d75db044cd08363e7e + - https://github.com/Foundry376/Mailspring/archive/1.6.2.tar.gz : c8f5977e474f431b9b98297148cb48026a5034427086e3c08a82bc1c7be3750b license : - GPL-3.0-or-later - Distributable # mailsync @@ -10,31 +10,49 @@ summary : A beautiful, fast and maintained fork of Nylas Mail by one of the original authors description: | Leaving Nylas Mail? Mailspring is a new version by one of the original authors. It's faster, leaner, and shipping today! Mailspring replaces the JavaScript mailsync code in Nylas Mail with a new C++ sync engine based on Mailcore2. It uses roughly half the RAM and CPU of Nylas Mail and idles with almost zero "CPU Wakes", which translates to great battery life. A major overhaul of the package manager and dependency tree mean it launches faster too. You might not even notice it's an Electron app! -extract : no networking : yes replaces : n1 builddeps : - pkgconfig(alsa) - - pkgconfig(gconf-2.0) - pkgconfig(gtk+-3.0) - - pkgconfig(krb5) - pkgconfig(libsecret-1) + - pkgconfig(pango) - pkgconfig(xkbfile) - - pkgconfig(xscrnsaver) - pkgconfig(xtst) - cups-devel + - git + - nodejs rundeps : - gnome-keyring # is required at least until kwallet can handle libsecret. + - libglvnd setup : | - ar x $sources/mailspring-${version}-amd64.deb - tar xf data.tar.* + %patch -p1 < $pkgfiles/0001-linux-don-t-build-a-deb-or-rpm-please.patch + %patch -p1 < $pkgfiles/0002-do-not-check-git-history.patch +build : | + npm config set unsafe-perm=true + npm install + npm run-script build install : | - install -dm00644 $installdir - cp -r usr $installdir + # Copy to our destination + install -dm00755 $installdir/usr/share/mailspring + cp -r $workdir/app/dist/mailspring-linux-x64/* $installdir/usr/share/mailspring/ + + # Install binary to $PATH + install -dm00755 $installdir/usr/bin/ + ln -sv /usr/share/mailspring/mailspring $installdir/usr/bin/mailspring + + # Install icons + for size in 16 32 64 128 256 512; do + install -Dm00644 $workdir/app/build/resources/linux/icons/$size.png \ + $installdir/usr/share/icons/hicolor/${size}x${size}/apps/mailspring.png + done + + # Install desktop file + ls $workdir/app/dist + install -Dm00644 $pkgfiles/mailspring.desktop $installdir/usr/share/applications/mailspring.desktop # Link to System Libraries rm $installdir/usr/share/mailspring/libEGL.so rm $installdir/usr/share/mailspring/libGLESv2.so - ln -s /usr/lib64/libEGL.so $installdir/usr/share/mailspring/libEGL.so ln -s /usr/lib64/libGLESv2.so $installdir/usr/share/mailspring/libGLESv2.so 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 @@ mailspring - Alec Scott - alecbcs@gmail.com + Longwu Ou + xulongwu4@gmail.com GPL-3.0-or-later Distributable @@ -21,15 +21,13 @@ network.mail /usr/bin/mailspring - /usr/share/appdata/mailspring.appdata.xml /usr/share/applications/mailspring.desktop - /usr/share/doc/mailspring/copyright /usr/share/icons/hicolor/128x128/apps/mailspring.png /usr/share/icons/hicolor/16x16/apps/mailspring.png /usr/share/icons/hicolor/256x256/apps/mailspring.png /usr/share/icons/hicolor/32x32/apps/mailspring.png + /usr/share/icons/hicolor/512x512/apps/mailspring.png /usr/share/icons/hicolor/64x64/apps/mailspring.png - /usr/share/lintian/overrides/mailspring /usr/share/mailspring/LICENSE /usr/share/mailspring/LICENSES.chromium.html /usr/share/mailspring/chrome_100_percent.pak @@ -192,8 +190,8 @@ /usr/share/mailspring/resources/app.asar.unpacked/node_modules/@paulcbetts/spellchecker/vendor/hunspell/src/parsers/textparser.hxx /usr/share/mailspring/resources/app.asar.unpacked/node_modules/@paulcbetts/spellchecker/vendor/hunspell_dictionaries/README.txt /usr/share/mailspring/resources/app.asar.unpacked/node_modules/@paulcbetts/spellchecker/vendor/hunspell_dictionaries/en-US.bdic - /usr/share/mailspring/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Debug/better_sqlite3.node - /usr/share/mailspring/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Debug/obj.target/better_sqlite3.node + /usr/share/mailspring/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node + /usr/share/mailspring/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/obj.target/better_sqlite3.node /usr/share/mailspring/resources/app.asar.unpacked/node_modules/emoji-data/vendor/emoji-data/emoji.json /usr/share/mailspring/resources/app.asar.unpacked/node_modules/jszip/vendor/FileSaver.js /usr/share/mailspring/resources/app.asar.unpacked/node_modules/keyboard-layout/build/Release/keyboard-layout-manager.node @@ -219,19 +217,18 @@ /usr/share/mailspring/swiftshader/libGLESv2.so /usr/share/mailspring/v8_context_snapshot.bin /usr/share/mailspring/version - /usr/share/pixmaps/mailspring.png n1 - - 2019-04-06 - 1.6.1 + + 2019-06-28 + 1.6.2 Packaging update - Alec Scott - alecbcs@gmail.com + Longwu Ou + xulongwu4@gmail.com \ No newline at end of file