From 13572036d274873c0947bb418ba78f2d0a854f4c Mon Sep 17 00:00:00 2001
From: Christian Elmer <christian@keinkurt.de>
Date: Mon, 1 Aug 2016 15:49:32 +0200
Subject: [PATCH 1/2] add Mac OSX defines and installation paths

---
 rssguard.pro                  | 21 +++++++++++++--------
 src/definitions/definitions.h | 10 ++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/rssguard.pro b/rssguard.pro
index 72c2a4282..062b7d8fc 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -597,8 +597,8 @@ win32 {
               sql feeds texts ico app_icon app_plain_icon translations
 }
 
-# Install all files on Linux.
-unix:!mac {
+# Install all files on Linux and Mac OSX.
+unix: {
   target.path = $$PREFIX/bin
 
   # Install SQL initializers.
@@ -625,16 +625,21 @@ unix:!mac {
   misc_texts.files = $$TEXTS
   misc_texts.path = $$quote($$PREFIX/share/$$TARGET/information/)
 
+  translations.files = $$OUT_PWD/l10n
+  translations.path = $$quote($$PREFIX/share/$$TARGET/)
+
+  INSTALLS += target misc_sql misc_icons misc_feeds \
+              misc_icon misc_plain_icon skins misc_texts \
+              translations
+}
+
+# Install files on Linux only.
+unix:!mac {
   desktop_file.files = resources/desktop/$${TARGET}.desktop
   desktop_file.path = $$quote($$PREFIX/share/applications/)
 
   desktop_file_autostart.files = resources/desktop/$${TARGET}.desktop.autostart
   desktop_file_autostart.path = $$quote($$PREFIX/share/$${TARGET}/autostart/)
 
-  translations.files = $$OUT_PWD/l10n
-  translations.path = $$quote($$PREFIX/share/$$TARGET/)
-
-  INSTALLS += target misc_sql misc_icons misc_feeds \
-              misc_icon misc_plain_icon skins misc_texts \
-              desktop_file desktop_file_autostart translations
+  INSTALLS += desktop_file desktop_file_autostart
 }
diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h
index 4286c260d..a0bbcbe4c 100755
--- a/src/definitions/definitions.h
+++ b/src/definitions/definitions.h
@@ -218,6 +218,16 @@
 #define APP_ICON_PATH APP_PREFIX + QString("/share/pixmaps/rssguard.png")
 #define APP_ICON_PLAIN_PATH APP_PREFIX + QString("/share/rssguard/icons/rssguard_plain.png")
 #define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds")
+#elif defined(Q_OS_OSX)
+#define APP_LANG_PATH APP_PREFIX + QString("/share/rssguard/l10n")
+#define APP_SKIN_PATH APP_PREFIX + QString("/share/rssguard/skins")
+#define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information")
+#define APP_THEME_PATH APP_PREFIX + QString("/share/rssguard/icons")
+#define APP_MISC_PATH APP_PREFIX + QString("/share/rssguard/misc")
+#define APP_ICON_PATH APP_PREFIX + QString("/share/pixmaps/rssguard.png")
+#define APP_INFO_PATH APP_PREFIX + QString("/share/rssguard/information")
+#define APP_ICON_PLAIN_PATH APP_PREFIX + QString("/share/rssguard/icons/rssguard_plain.png")
+#define APP_INITIAL_FEEDS_PATH APP_PREFIX + QString("/share/rssguard/initial_feeds")
 #elif defined(Q_OS_WIN)
 #define APP_LANG_PATH QApplication::applicationDirPath() + QString("/l10n")
 #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/skins")

From 59a30887e52ddc9d2388fee2c42b043cae9437d6 Mon Sep 17 00:00:00 2001
From: Christian Elmer <christian@keinkurt.de>
Date: Wed, 3 Aug 2016 16:23:46 +0200
Subject: [PATCH 2/2] update Info.plist and use different install sections for
 linux and mac

---
 resources/macosx/Info.plist.in | 20 +++++-------
 rssguard.pro                   | 60 ++++++++++++++++++++++++++--------
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/resources/macosx/Info.plist.in b/resources/macosx/Info.plist.in
index d4f8076aa..5968f5b4c 100755
--- a/resources/macosx/Info.plist.in
+++ b/resources/macosx/Info.plist.in
@@ -6,33 +6,31 @@
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundleExecutable</key>
-    <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+    <string>@EXECUTABLE@</string>
     <key>CFBundleGetInfoString</key>
-    <string>${MACOSX_BUNDLE_INFO_STRING}</string>
+    <string>@EXECUTABLE@ (C) 2011-2016 Martin Rotter</string>
     <key>CFBundleIconFile</key>
-    <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+    <string>@ICON@</string>
     <key>CFBundleIdentifier</key>
-    <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+    <string>org.rssguard.RSSGuard</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
-    <key>CFBundleLongVersionString</key>
-    <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
     <key>CFBundleName</key>
-    <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+    <string>@EXECUTABLE@</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+    <string>3.3.3</string>
     <key>CFBundleSignature</key>
-    <string>????</string>
+    <string>@TYPEINFO@<string>
     <key>CFBundleVersion</key>
-    <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+    <string>1.0.0</string>
     <key>CSResourcesFileMapped</key>
     <true/>
     <key>LSRequiresCarbon</key>
     <true/>
     <key>NSHumanReadableCopyright</key>
-    <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+    <string>(C) 2011-2016 Martin Rotter</string>
 <!--
 	<key>NOTE</key>
     <string>Icon is disabled from dock. Only systray is used.</string>
diff --git a/rssguard.pro b/rssguard.pro
index 062b7d8fc..d54fb37cb 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -597,8 +597,8 @@ win32 {
               sql feeds texts ico app_icon app_plain_icon translations
 }
 
-# Install all files on Linux and Mac OSX.
-unix: {
+# Install all files on Linux.
+unix:!mac {
   target.path = $$PREFIX/bin
 
   # Install SQL initializers.
@@ -625,21 +625,55 @@ unix: {
   misc_texts.files = $$TEXTS
   misc_texts.path = $$quote($$PREFIX/share/$$TARGET/information/)
 
-  translations.files = $$OUT_PWD/l10n
-  translations.path = $$quote($$PREFIX/share/$$TARGET/)
-
-  INSTALLS += target misc_sql misc_icons misc_feeds \
-              misc_icon misc_plain_icon skins misc_texts \
-              translations
-}
-
-# Install files on Linux only.
-unix:!mac {
   desktop_file.files = resources/desktop/$${TARGET}.desktop
   desktop_file.path = $$quote($$PREFIX/share/applications/)
 
   desktop_file_autostart.files = resources/desktop/$${TARGET}.desktop.autostart
   desktop_file_autostart.path = $$quote($$PREFIX/share/$${TARGET}/autostart/)
 
-  INSTALLS += desktop_file desktop_file_autostart
+  translations.files = $$OUT_PWD/l10n
+  translations.path = $$quote($$PREFIX/share/$$TARGET/)
+
+  INSTALLS += target misc_sql misc_icons misc_feeds \
+              misc_icon misc_plain_icon skins misc_texts \
+              desktop_file desktop_file_autostart translations
+}
+
+mac {
+  CONFIG += app_bundle
+  QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
+
+  QMAKE_INFO_PLIST = resources/macosx/Info.plist.in
+  ICON = resources/macosx/$${TARGET}.icns
+  IDENTIFIER = org.$${TARGET}.RSSGuard
+
+  # Install SQL initializers.
+  misc_sql.files = resources/misc
+  misc_sql.path = Contents/Resources
+
+  # Misc icons.
+  misc_icons.files = resources/graphics/misc
+  misc_icons.path = Contents/Resources/icons
+
+  # Initial feeds.
+  misc_feeds.files = resources/initial_feeds
+  misc_feeds.path = Contents/Resources
+
+  skins.files = resources/skins
+  skins.path = Contents/Resources
+
+  misc_plain_icon.files = resources/graphics/$${TARGET}_plain.png
+  misc_plain_icon.path = Contents/Resources/icons
+
+  misc_texts.files = $$TEXTS
+  misc_texts.path = Contents/Resources/information
+
+  translations.files = $$OUT_PWD/l10n
+  translations.path =  Contents/Resources
+
+  QMAKE_BUNDLE_DATA += misc_sql misc_icons misc_feeds skins \
+                       misc_plain_icon misc_texts translations
+
+  INSTALLS += misc_sql misc_icons misc_feeds skins \
+              misc_plain_icon misc_texts translations
 }