Merge branch 'master' into helpershelpers

5 files changed, 11 insertions, 10 deletions

diff --git a/extra/shared-mime-info/build b/extra/shared-mime-info/build
index d69c0330..c2b41d9d 100755
--- a/extra/shared-mime-info/build
+++ b/extra/shared-mime-info/build
@@ -3,9 +3,6 @@
 # We bypass the build system entirely as it has
 # a mandatory dependency on gettext.
 
-# Grab the package version.
-read -r version _ < "${0%/*}/version"
-
 mkdir -p "$1/usr/share/mime/packages" \
          "$1/usr/share/pkgconfig" \
          "$1/usr/bin"
@@ -15,7 +12,7 @@ sed -e 's/_comment/comment/g' data/freedesktop.org.xml.in \
     > "$1/usr/share/mime/packages/freedesktop.org.xml"
 
 # Replace markers in the file.
-sed -e 's|@prefix@|/usr|' -e "s|@VERSION@|$version|" shared-mime-info.pc.in \
+sed -e 's|@prefix@|/usr|' -e "s|@VERSION@|$2|" shared-mime-info.pc.in \
     > "$1/usr/share/pkgconfig/shared-mime-info.pc"
 
 # Define our own config.h statically.
@@ -37,12 +34,12 @@ cat << EOF > src/config.h
 #define PACKAGE "shared-mime-info"
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_NAME "shared-mime-info"
-#define PACKAGE_STRING "shared-mime-info $version"
+#define PACKAGE_STRING "shared-mime-info $2"
 #define PACKAGE_TARNAME "shared-mime-info"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "$version"
+#define PACKAGE_VERSION "$2"
 #define STDC_HEADERS 1
-#define VERSION "$version"
+#define VERSION "$2"
 EOF
 
 # Fix config.h include.
diff --git a/extra/shared-mime-info/checksums b/extra/shared-mime-info/checksums
index 2a502c63..7b8bf18b 100644
--- a/extra/shared-mime-info/checksums
+++ b/extra/shared-mime-info/checksums
@@ -1 +1 @@
-23c1cb7919f31cf97aeb5225548f75705f706aa5cc7d1c4c503364bcc8681e06  shared-mime-info-2.0.tar.xz
+b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563  shared-mime-info-2.1.tar.xz
diff --git a/extra/shared-mime-info/post-install b/extra/shared-mime-info/post-install
index e9dffaad..646ccda3 100755
--- a/extra/shared-mime-info/post-install
+++ b/extra/shared-mime-info/post-install
@@ -1,3 +1,7 @@
 #!/bin/sh -e
 
+printf '\033[1;33mNOTE:\033[m \033[1m%s\n      %s\n      %s\033[m\n' \
+    "Please be patient this might take really long, especially during updates." \
+    "It might seem to be stuck, but it most probably isn't. The wait can" \
+    "be up to 10 minutes."
 update-mime-database -V /usr/share/mime
diff --git a/extra/shared-mime-info/sources b/extra/shared-mime-info/sources
index a865d4d3..858173cd 100644
--- a/extra/shared-mime-info/sources
+++ b/extra/shared-mime-info/sources
@@ -1 +1 @@
-https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0440063a2e6823a4b1a6fb2f2af8350f/shared-mime-info-2.0.tar.xz
+https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz
diff --git a/extra/shared-mime-info/version b/extra/shared-mime-info/version
index 8c676773..1fedb862 100644
--- a/extra/shared-mime-info/version
+++ b/extra/shared-mime-info/version
@@ -1 +1 @@
-2.0 1
+2.1 1