Merge remote-tracking branch 'meson/master'

.gitignore

@@ -0,0 +1,5 @@
+.flatpak-builder/
+*~
+__pycache__
+gahshomar.sublime-workspace
+gahshomar.sublime-project

AUTHORS

@@ -0,0 +1,11 @@
+    Gahshomar Authors
+    ===================
+
+Gahshomar is written by:
+
+    Amir Mohammadi <[email protected]>
+
+Gahshomar includes a fork of ![Khayyam](https://github.com/pylover/khayyam) which is written by:
+	Vahid Mardani <[email protected]>
+
+Gahshomar's icon is a modified icon from ![Moka icons](http://mokaproject/moka-icon-theme)

ChangeLog

@@ -0,0 +1,5 @@
+5.0.0:
+  Complete re-write of the app using only Python and new technologies such as
+  flatpak and meson.
+4.5.1:
+  Added support for Afghan month names

NEWS

@@ -0,0 +1,7 @@
+Overview of changes in 4.0.0
+=============================
+
+* Application uses make now
+* UI is re-written
+* some parts of the app are written in C now.
+* added plugin management using libpeas

README

@@ -0,0 +1,30 @@
+Gahshomar (گاه‌شمار) [![Build Status](https://travis-ci.org/Gahshomar/gahshomar.svg?branch=master)](https://travis-ci.org/Gahshomar/gahshomar)
+================
+A Persian (Jalali/Farsi) calendar. The calendar provides a main interface for easily
+converting dates between Iranian and Gregorian calendar. Also, an appindicator and a
+Gnome-shell extension is provided to keep track of the date in the Iranian calendar system.
+
+
+Screenshot
+================
+![Gnome](https://raw.githubusercontent.com/Gahshomar/gahshomar/master/data/Screenshot-Gnome.png)
+![Unity](https://raw.githubusercontent.com/Gahshomar/gahshomar/master/data/Screenshot-Unity.png)
+
+Feaures
+================
+A main interface useful for converting dates between calendars.
+
+Several front-ends for displaying the current date on your desktop:
+
+  * A Gnome Shell extension (Must be activated after installation in Gnome tweak tool).
+  * An Appindicator icon to be used in enviornments like Unity or KDE (Must be activated after installation in preferences of Gahshomar).
+  * A Systray icon to be used in enviornments like XFCE or Mate (Must be activated after installation in preferences of Gahshomar).
+
+Installation
+================
+See the [Wiki](https://github.com/Gahshomar/gahshomar/wiki/Installation)
+
+
+Support or Contact
+================
+Having troubles? [Fill an issue](https://github.com/Gahshomar/gahshomar/issues).

README.md

@@ -0,0 +1 @@
+README

appindicator-rip-build-system-apart.patch

@@ -0,0 +1,187 @@
+diff -ru libappindicator-7/configure.ac libappindicator-patched/configure.ac
+--- libappindicator-7/configure.ac	2012-07-11 13:28:51.115114265 -0400
++++ libappindicator-patched/configure.ac	2017-05-06 22:37:46.792117906 -0400
+@@ -86,58 +86,6 @@
+
+ AM_CONDITIONAL(INTROSPECTION_TEN, [test "x$introspection_ten" = "xyes"])
+
+-###########################
+-# Vala API Generation
+-###########################
+-
+-AC_PATH_PROG([VALA_API_GEN], [vapigen])
+-AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$VALA_API_GEN" != "x"])
+-
+-###########################
+-# Vala Compiler support
+-###########################
+-
+-AM_PROG_VALAC([0.14.0])
+-AM_CONDITIONAL(HAVE_VALAC, [test "x$VALAC" != "x"])
+-
+-###########################
+-# Check for Mono support
+-###########################
+-
+-MONO_REQUIRED_VERSION=1.0
+-PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
+-AM_CONDITIONAL(HAS_MONO, [test "x$has_mono" = "xtrue"])
+-
+-AC_PATH_PROG(AL, al, no)
+-if test "x$AL" = "xno" ; then
+-   AC_MSG_NOTICE([No al tool found.  You need to install Mono.])
+-fi
+-
+-if test "x$has_mono" = "xtrue" ; then
+-   GENERATED_SOURCES=generated/*.cs
+-   AC_PATH_PROG(RUNTIME, mono, no)
+-
+-   if test "x$RUNTIME" != "no" ; then
+-      RUNTIME=mono
+-   fi
+-
+-   AC_PATH_PROG(CSC, gmcs, no)
+-   LIB_PREFIX=.so
+-   LIB_SUFFIX=
+-fi
+-
+-if test "x$CSC" = "xno" ; then
+-   AC_MSG_NOTICE([No Mono compiler found.])
+-fi
+-
+-AC_PATH_PROG(GACUTIL, gacutil, no)
+-if test "x$GACUTIL" = "xno" ; then
+-   AC_MSG_NOTICE([No gacutil tool found])
+-fi
+-
+-AC_SUBST(RUNTIME)
+-AC_SUBST(CSC)
+-AC_SUBST(GACUTIL)
+ AC_SUBST(LIB_PREFIX)
+ AC_SUBST(LIB_SUFFIX)
+ AC_SUBST(GENERATED_SOURCES)
+@@ -154,60 +102,6 @@
+ AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
+ AC_SUBST(GAPI_FIXUP)
+
+-# Check for nunit
+-AC_ARG_ENABLE([mono-test],
+-	AC_HELP_STRING([--disable-mono-test], [Disable mono test]),,
+-	[enable_mono_test=auto])
+-
+-if test x"$enable_mono_test" != x"no" ; then
+-   PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7,
+-      [have_nunit=yes],
+-      [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit,
+-         [have_nunit=yes],
+-         [have_nunit=no])
+-   ])
+-   if test x${enable_mono_test} = xyes && test x${have_nunit} = xno; then
+-     AC_MSG_ERROR([Mono test configured but nunit not found])
+-   fi
+-else
+-   have_nunit=no
+-fi
+-AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes)
+-
+-###########################
+-# Check to see if we're local
+-###########################
+-
+-with_localinstall="no"
+-AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
+-
+-###########################
+-# Python
+-###########################
+-
+-PYGTK_REQUIRED=2.14.0
+-PYGOBJECT_REQUIRED=0.22
+-
+-AM_PATH_PYTHON(2.3.5)
+-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+-
+-PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
+-                  [
+-					pygtk-2.0 >= $PYGTK_REQUIRED
+-					gtk+-2.0 >= $GTK_REQUIRED_VERSION
+-					pygobject-2.0 >= $PYGOBJECT_REQUIRED
+-                  ])
+-
+-AC_MSG_CHECKING(for pygtk defs)
+-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+-AC_SUBST(PYGTK_DEFSDIR)
+-AC_MSG_RESULT($PYGTK_DEFSDIR)
+-
+-AC_MSG_CHECKING(for pygtk codegen)
+-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
+-AC_SUBST(PYGTK_CODEGEN)
+-AC_MSG_RESULT($PYGTK_CODEGEN)
+-
+ #########################
+ # Check if build tests
+ #########################
+@@ -238,30 +132,13 @@
+ src/Makefile
+ src/appindicator-0.1.pc
+ src/appindicator3-0.1.pc
+-bindings/Makefile
+-bindings/python/Makefile
+-bindings/python/appindicator.override
+-bindings/vala/Makefile
+-bindings/vala/examples/Makefile
+ tests/Makefile
+-example/Makefile
+ docs/Makefile
+ docs/reference/Makefile
+ docs/reference/version.xml
+ docs/reference/libappindicator-docs.sgml
+ ])
+
+-if test "x$has_mono" = "xtrue" ; then
+-    AC_CONFIG_FILES([
+-    bindings/mono/Makefile
+-    bindings/mono/appindicator-sharp.dll.config
+-    bindings/mono/appindicator-sharp-0.1.pc
+-    bindings/mono/app-indicator.sources.xml
+-    bindings/mono/examples/Makefile
+-    bindings/mono/examples/indicator-example
+-    ])
+-fi
+-
+ AC_OUTPUT
+
+ ###########################
+@@ -274,8 +151,6 @@
+
+ 	Prefix:        $prefix
+ 	GTK+ Version:  $with_gtk
+-	Mono:          $has_mono
+ 	Tests:         $enable_tests
+-	Mono tests:    $have_nunit
+ 	gcov:	       $use_gcov
+ ])
+diff -ru libappindicator-7/Makefile.am libappindicator-patched/Makefile.am
+--- libappindicator-7/Makefile.am	2012-07-11 13:28:34.415113869 -0400
++++ libappindicator-patched/Makefile.am	2017-05-06 22:37:35.213890331 -0400
+@@ -2,8 +2,6 @@
+
+ SUBDIRS = \
+       src		\
+-	  bindings	\
+-	  example	\
+ 	  docs
+
+ if WANT_TESTS
+diff -ru libappindicator-7/src/Makefile.am libappindicator-patched/src/Makefile.am
+--- libappindicator-7/src/Makefile.am	2012-07-11 13:28:34.415113869 -0400
++++ libappindicator-patched/src/Makefile.am	2017-05-06 22:44:57.719587973 -0400
+@@ -76,7 +76,7 @@
+ libappindicator_la_CFLAGS = \
+ 	$(LIBRARY_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+-	-Wall -Werror \
++	-Wall \
+ 	-DG_LOG_DOMAIN=\"libappindicator\"
+
+ libappindicator_la_LIBADD = \

build-aux/meson/postinstall.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+
+from os import environ, path
+from subprocess import call
+
+prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local')
+datadir = path.join(prefix, 'share')
+destdir = environ.get('DESTDIR', '')
+
+# Package managers set this so we don't need to run
+if not destdir:
+    print('Updating icon cache...')
+    call([
+        'gtk-update-icon-cache', '-qtf',
+        path.join(datadir, 'icons', 'hicolor')
+    ])
+    call([
+        'gtk-update-icon-cache', '-qtf',
+        path.join(datadir, 'icons', 'HighContrast')
+    ])
+
+    print('Updating desktop database...')
+    call(['update-desktop-database', '-q', path.join(datadir, 'applications')])
+
+    print('Compiling GSettings schemas...')
+    call(['glib-compile-schemas', path.join(datadir, 'glib-2.0', 'schemas')])