diff --git a/.gitignore b/.gitignore index b8acf3139..009d730ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,46 +1 @@ -.deps -*.a -*.gmo -*.o -*.Po -*.la -*.lo -Makefile -Makefile.in -aclocal.m4 -ar-lib -autom4te.cache -compile -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -liferea.appdata.xml -liferea.desktop -ltmain.sh -missing -net.sf.liferea.gschema.valid -net.sf.liferea.gschema.xml -net.sourceforge.liferea.desktop -net.sourceforge.liferea.service -po/.intltool-merge-cache -po/Makefile.in.in -po/POTFILES po/liferea.pot -po/stamp-it -src/dbus_wrap.c -src/liferea -src/liferea-add-feed -src/Liferea-3.0.gir -src/Liferea-3.0.typelib -src/tests/html_auto -src/tests/parse_date -xslt/*.xml -org.gnome.liferea.gschema.valid -stamp-h1 diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index e1fc011ab..000000000 --- a/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -## Process this file with automake to produce Makefile.in - -SUBDIRS = doc man opml pixmaps po src xslt glade - -desktop_in_files = net.sourceforge.liferea.desktop.in -desktopdir = $(datadir)/applications -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -dbusservicedir = $(datadir)/dbus-1/services -dbusservice_DATA = net.sourceforge.liferea.service - -net.sourceforge.liferea.service: Makefile - $(AM_V_GEN) (echo '[D-BUS Service]'; \ - echo 'Name=net.sourceforge.liferea'; \ - echo 'Exec=${bindir}/liferea --gapplication-service') > $@.tmp && \ - mv $@.tmp $@ - - -appdatadir = $(datadir)/appdata -appdata_in_files = $(PACKAGE_TARNAME).appdata.xml.in -appdata_DATA = $(appdata_in_files:.xml.in=.xml) - -@INTLTOOL_XML_RULE@ - -cssdir = $(pkgdatadir)/css -css_DATA = \ - css/liferea.css \ - css/user.css \ - css/adblock.css - -dtddir = $(pkgdatadir)/dtd -dtd_DATA = dtd/html.ent - -plugindir = $(pkglibdir)/plugins -plugin_DATA = \ - plugins/bold-unread.py \ - plugins/bold-unread.plugin \ - plugins/gnome-keyring.py \ - plugins/gnome-keyring.plugin \ - plugins/libnotify.py \ - plugins/libnotify.plugin \ - plugins/media-player.py \ - plugins/media-player.plugin \ - plugins/plugin-installer.py \ - plugins/plugin-installer.plugin \ - plugins/trayicon.py \ - plugins/trayicon.plugin - -gsettings_SCHEMAS = net.sf.liferea.gschema.xml -@INTLTOOL_XML_NOMERGE_RULE@ -@GSETTINGS_RULES@ - -data_convertdir = $(datadir)/GConf/gsettings -dist_data_convert_DATA = liferea.convert - -EXTRA_DIST = \ - net.sf.liferea.gschema.xml.in \ - po/liferea.pot \ - $(desktop_in_files) \ - $(desktop_DATA) \ - $(schema_DATA) \ - $(css_DATA) \ - $(dtd_DATA) \ - $(plugin_DATA) \ - $(gsettings_SCHEMAS) \ - $(appdata_in_files) \ - $(appdata_DATA) - -DISTCLEANFILES = \ - liferea.desktop \ - intltool-extract \ - intltool-merge \ - intltool-update \ - $(gsettings_SCHEMAS) - -CLEANFILES = \ - $(gsettings_SCHEMAS) \ - $(appdata_DATA) - -po/liferea.pot: - cd po && $(MAKE) liferea.pot diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 3bca780a6..000000000 --- a/autogen.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -tmp=`which autoreconf` -if [ "$tmp" = "" ]; then - echo "ERROR: You need to install autoconf!" - exit 1 -fi - -tmp=`which intltoolize` -if [ "$tmp" = "" ]; then - echo "ERROR: You need to install intltool!" - exit 1 -fi - -tmp=`which libtoolize` -if [ "$tmp" = "" ]; then - echo "ERROR: You need to install libtool!" - exit 1 -fi - -autoreconf -i -intltoolize -if test -z "$NOCONFIGURE"; then -./configure "$@" -fi - diff --git a/configure.ac b/configure.ac deleted file mode 100644 index c17bf6848..000000000 --- a/configure.ac +++ /dev/null @@ -1,116 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_INIT([liferea],[1.12.2],[liferea-devel@lists.sourceforge.net]) -AC_CANONICAL_HOST -AC_CONFIG_SRCDIR([src/feedlist.c]) - -AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.11 foreign std-options -Wall -Werror]) -AM_SILENT_RULES([yes]) - -dnl Needed for automake 1.12 -m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - -AC_PREREQ(2.59) - -LT_INIT -IT_PROG_INTLTOOL([0.40.4]) - -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_MAKE_SET -AC_SYS_LARGEFILE -GLIB_GSETTINGS - -AC_CHECK_FUNCS([strsep]) - -PKG_PROG_PKG_CONFIG() - -################################################################################ -# Mandatory library dependencies - -pkg_modules=" gtk+-3.0 >= 3.14.0 - glib-2.0 >= 2.28.0 - gio-2.0 >= 2.26.0 - pango >= 1.4.0 - libxml-2.0 >= 2.6.27 - libxslt >= 1.1.19 - sqlite3 >= 3.7.0 - gmodule-2.0 >= 2.0.0 - gthread-2.0 - libsoup-2.4 >= 2.42 - webkit2gtk-4.0 - json-glib-1.0 - gobject-introspection-1.0 - gsettings-desktop-schemas - libpeas-1.0 >= 1.0.0 - libpeas-gtk-1.0 >= 1.0.0" - -################################################################################ - -PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) - -AC_SUBST(PACKAGE_CFLAGS) -AC_SUBST(PACKAGE_LIBS) - -PKG_CHECK_MODULES([WEB_EXTENSION], [ - webkit2gtk-web-extension-4.0 - ]) -AC_SUBST([WEB_EXTENSION_CFLAGS]) -AC_SUBST([WEB_EXTENSION_LIBS]) - -uname=`uname` -AC_DEFINE_UNQUOTED(OS, $uname, [defines a OS version string, used for OS specific code]) -AC_DEFINE_UNQUOTED(OSNAME, "$uname", [defines a OS version string, used for the user agent string]) -AC_MSG_RESULT(user agent OS = $uname) - -################################################################################ -# Plugins via Introspection - -GOBJECT_INTROSPECTION_CHECK([0.9.3]) - -################################################################################ - -AM_GLIB_GNU_GETTEXT - -GETTEXT_PACKAGE=liferea -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain]) - - -AC_CONFIG_FILES([ -Makefile -net.sf.liferea.gschema.xml -src/Makefile -src/webkit/Makefile -src/webkit/web_extension/Makefile -src/parsers/Makefile -src/fl_sources/Makefile -src/ui/Makefile -src/tests/Makefile -doc/Makefile -doc/html/Makefile -xslt/Makefile -man/Makefile -man/pl/Makefile -pixmaps/Makefile -pixmaps/16x16/Makefile -pixmaps/22x22/Makefile -pixmaps/24x24/Makefile -pixmaps/32x32/Makefile -pixmaps/48x48/Makefile -pixmaps/scalable/Makefile -opml/Makefile -glade/Makefile -po/Makefile.in -src/liferea-add-feed -]) -AC_OUTPUT - -echo -echo "$PACKAGE $VERSION" -echo -eval eval echo Liferea will be installed in $bindir. -echo -echo configure complete, now type \'make\' -echo diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index e5d68ef45..000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = \ - Doxyfile - -SUBDIRS = html diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am deleted file mode 100644 index 0635cb98e..000000000 --- a/doc/html/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -html_doc_en = about_en.html \ - concepts_en.html \ - folders_en.html \ - headlines_en.html \ - preferences_en.html \ - reference_en.html \ - searching_en.html \ - subscriptions_en.html \ - topics_en.html \ - updating_en.html \ - enclosures_en.html \ - newsbin_en.html \ - onlineservices_en.html \ - faq_en.html - -html_doc_de = about_de.html \ - concepts_de.html \ - folders_de.html \ - headlines_de.html \ - preferences_de.html \ - reference_de.html \ - searching_de.html \ - subscriptions_de.html \ - topics_de.html \ - updating_de.html \ - enclosures_de.html \ - newsbin_de.html \ - onlineservices_de.html \ - faq_de.html - -html_doc_pictures_en = help_feed_default.png \ - help_feed_error.png \ - help_folder.png \ - help_opml.png \ - help_feed_prop_downl_1.6.0.png \ - help_feed_prop_cache_1.6.0.png \ - help_feed_prop_adv_1.6.0.png \ - help_feed_prop_general_1.6.0.png \ - help_feed_prop_source_1.6.0.png \ - help_item_flag.png \ - help_item_unread.png \ - help_prefs_browser_1.6.0.png \ - help_prefs_enclosures_1.6.0.png \ - help_prefs_feeds_1.6.0.png \ - help_prefs_folders_1.6.0.png \ - help_prefs_gui_1.6.0.png \ - help_prefs_headlines_1.6.0.png \ - help_prefs_proxy_1.6.0.png \ - help_search_1.6.0.png \ - help_subscribe_1.6.0.png \ - help_subscribe_adv_1.6.0.png \ - help_vfolder_1.6.0.png - -EXTRA_DIST = $(html_doc_en) \ - $(html_doc_de) \ - $(html_doc_pictures_en) \ - reference.css - - -htmldoc_DATA = $(html_doc_en) \ - $(html_doc_de) \ - $(html_doc_pictures_en) \ - reference.css - -htmldocdir = $(datadir)/liferea/doc/html - diff --git a/doc/html/meson.build b/doc/html/meson.build new file mode 100644 index 000000000..4aaafafd8 --- /dev/null +++ b/doc/html/meson.build @@ -0,0 +1,65 @@ +html_doc_en = [ 'about_en.html', + 'concepts_en.html', + 'folders_en.html', + 'headlines_en.html', + 'preferences_en.html', + 'reference_en.html', + 'searching_en.html', + 'subscriptions_en.html', + 'topics_en.html', + 'updating_en.html', + 'enclosures_en.html', + 'newsbin_en.html', + 'onlineservices_en.html', + 'faq_en.html' + ] + +html_doc_de = [ 'about_de.html', + 'concepts_de.html', + 'folders_de.html', + 'headlines_de.html', + 'preferences_de.html', + 'reference_de.html', + 'searching_de.html', + 'subscriptions_de.html', + 'topics_de.html', + 'updating_de.html', + 'enclosures_de.html', + 'newsbin_de.html', + 'onlineservices_de.html', + 'faq_de.html' + ] + +html_doc_pictures_en = ['help_feed_default.png', + 'help_feed_error.png', + 'help_folder.png', + 'help_opml.png', + 'help_feed_prop_downl_1.6.0.png', + 'help_feed_prop_cache_1.6.0.png', + 'help_feed_prop_adv_1.6.0.png', + 'help_feed_prop_general_1.6.0.png', + 'help_feed_prop_source_1.6.0.png', + 'help_item_flag.png', + 'help_item_unread.png', + 'help_prefs_browser_1.6.0.png', + 'help_prefs_enclosures_1.6.0.png', + 'help_prefs_feeds_1.6.0.png', + 'help_prefs_folders_1.6.0.png', + 'help_prefs_gui_1.6.0.png', + 'help_prefs_headlines_1.6.0.png', + 'help_prefs_proxy_1.6.0.png', + 'help_search_1.6.0.png', + 'help_subscribe_1.6.0.png', + 'help_subscribe_adv_1.6.0.png', + 'help_vfolder_1.6.0.png' + ] + +install_data ( + [ + html_doc_en, + html_doc_de, + html_doc_pictures_en, + 'reference.css' + ], + install_dir: join_paths (pkgdatadir, 'doc', 'html') +) diff --git a/glade/Makefile.am b/glade/Makefile.am deleted file mode 100644 index b516f1258..000000000 --- a/glade/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -## Process this file with automake to produce Makefile.in - -gladedir = $(pkgdatadir) -glade_DATA = about.ui \ - auth.ui \ - enclosure_handler.ui \ - google_source.ui \ - inoreader_source.ui \ - mainwindow.ui \ - new_folder.ui \ - new_newsbin.ui \ - new_subscription.ui \ - node_source.ui \ - opml_source.ui \ - prefs.ui \ - properties.ui \ - reedah_source.ui \ - rename_node.ui \ - search_folder.ui \ - search.ui \ - simple_search.ui \ - simple_subscription.ui \ - theoldreader_source.ui \ - ttrss_source.ui \ - update_monitor.ui \ - liferea.css - -EXTRA_DIST = \ - $(glade_DATA) diff --git a/glade/meson.build b/glade/meson.build new file mode 100644 index 000000000..14c7d27af --- /dev/null +++ b/glade/meson.build @@ -0,0 +1,28 @@ +install_data ( + [ + 'about.ui', + 'auth.ui', + 'enclosure_handler.ui', + 'google_source.ui', + 'inoreader_source.ui', + 'mainwindow.ui', + 'new_folder.ui', + 'new_newsbin.ui', + 'new_subscription.ui', + 'node_source.ui', + 'opml_source.ui', + 'prefs.ui', + 'properties.ui', + 'reedah_source.ui', + 'rename_node.ui', + 'search_folder.ui', + 'search.ui', + 'simple_search.ui', + 'simple_subscription.ui', + 'theoldreader_source.ui', + 'ttrss_source.ui', + 'update_monitor.ui', + 'liferea.css' + ], + install_dir: pkgdatadir +) diff --git a/liferea.appdata.xml.in b/liferea.appdata.xml.in index e509fec7b..03bf959b1 100644 --- a/liferea.appdata.xml.in +++ b/liferea.appdata.xml.in @@ -3,25 +3,25 @@ net.sourceforge.liferea.desktop CC0 Liferea - <_summary>RSS feed reader + RSS feed reader - <_p>Liferea is an abbreviation for Linux Feed Reader. It is a news aggregator for +

Liferea is an abbreviation for Linux Feed Reader. It is a news aggregator for online news feeds. It supports a number of different feed formats including RSS/RDF, CDF and Atom. There are many other news readers available, but these others are not available for Linux or require many extra libraries to be installed. Liferea tries to fill this gap by creating a fast, easy to use, easy to install news aggregator for GTK/GNOME. - - <_p>Distinguishing features: +

+

Distinguishing features:

 diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 0f7947166..000000000 --- a/man/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = pl - -EXTRA_DIST = liferea.1 - -man_MANS = liferea.1 \ No newline at end of file diff --git a/man/meson.build b/man/meson.build new file mode 100644 index 000000000..2e132b27b --- /dev/null +++ b/man/meson.build @@ -0,0 +1,5 @@ +install_man ('liferea.1') + +install_man ('pl/liferea.1', + install_dir: join_paths (get_option ('mandir'), 'pl') +) diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am deleted file mode 100644 index 500ff7001..000000000 --- a/man/pl/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -mandir = @mandir@/pl - -EXTRA_DIST = liferea.1 - -man_MANS = liferea.1 \ No newline at end of file diff --git a/meson.build b/meson.build new file mode 100644 index 000000000..503754533 --- /dev/null +++ b/meson.build @@ -0,0 +1,127 @@ +project ('liferea', 'c', + version : '1.12.2', + license : 'GPL2', + meson_version : '>=0.42.0' +) + +i18n = import ('i18n') +gnome = import ('gnome') + +liferea_deps = [ + dependency ('gtk+-3.0', version : '>= 3.14.0'), + dependency ('glib-2.0', version : '>= 2.42.0'), + dependency ('gio-2.0'), + dependency ('pango'), + dependency ('libxml-2.0'), + dependency ('libxslt'), + dependency ('sqlite3'), + dependency ('gmodule-2.0'), + dependency ('gthread-2.0'), + dependency ('libsoup-2.4', version : '>= 2.42'), + dependency ('webkit2gtk-4.0'), + dependency ('json-glib-1.0'), + dependency ('gobject-introspection-1.0'), + dependency ('gsettings-desktop-schemas'), + dependency ('libpeas-1.0'), + dependency ('libpeas-gtk-1.0') +] + +webextension_deps = dependency ('webkit2gtk-web-extension-4.0') + +prefix = get_option ('prefix') +datadir = join_paths (prefix, get_option ('datadir')) +pkgdatadir = join_paths (datadir, meson.project_name ()) +bindir = join_paths (prefix, get_option ('bindir')) +pkglibdir = join_paths (prefix, get_option ('libdir'), meson.project_name ()) +webextensiondir = join_paths (pkglibdir, 'web-extension') +localedir = join_paths (prefix, get_option ('localedir')) + +uname_run = run_command ('uname') +osname = uname_run.stdout().strip() + +conf = configuration_data () +conf.set_quoted('PACKAGE', meson.project_name ()) +conf.set_quoted('GETTEXT_PACKAGE', meson.project_name ()) +conf.set_quoted('VERSION', meson.project_version ()) +conf.set_quoted('PACKAGE_LIB_DIR', pkglibdir) +conf.set_quoted('PACKAGE_DATA_DIR', datadir) +conf.set_quoted('PACKAGE_LOCALE_DIR', localedir) +conf.set_quoted('BIN_DIR', bindir) +conf.set_quoted('WEB_EXTENSIONS_DIR', webextensiondir) +conf.set_quoted('OSNAME', osname) + +configure_file (output : 'config.h', + configuration : conf +) + +dbusconf = configuration_data () +dbusconf.set ('bindir', bindir) + +configure_file (input: 'net.sourceforge.liferea.service.in', + output: 'net.sourceforge.liferea.service', + configuration : dbusconf, + install: true, + install_dir: join_paths (datadir, 'dbus-1', 'services') +) + +i18n.merge_file( + input: 'net.sourceforge.liferea.desktop.in', + output: 'net.sourceforge.liferea.desktop', + type: 'desktop', + po_dir: 'po', + install: true, + install_dir: join_paths(datadir, 'applications') +) + +i18n.merge_file( + input: 'liferea.appdata.xml.in', + output: 'liferea.appdata.xml', + po_dir: 'po', + install: true, + install_dir: join_paths(datadir, 'appdata') +) + +install_data ('net.sf.liferea.gschema.xml', + install_dir: join_paths(datadir, 'glib-2.0', 'schemas') +) + +install_data ('liferea.convert', + install_dir: join_paths (datadir, 'GConf', 'gsettings') +) + +install_data ( ['css/liferea.css', 'css/user.css', 'css/adblock.css'], + install_dir: join_paths (pkgdatadir, 'css') +) + +install_data ('dtd/html.ent', + install_dir: join_paths (pkgdatadir, 'dtd') +) + +install_data ( + [ + 'plugins/bold-unread.py', + 'plugins/bold-unread.plugin', + 'plugins/gnome-keyring.py', + 'plugins/gnome-keyring.plugin', + 'plugins/libnotify.py', + 'plugins/libnotify.plugin', + 'plugins/media-player.py', + 'plugins/media-player.plugin', + 'plugins/plugin-installer.py', + 'plugins/plugin-installer.plugin', + 'plugins/trayicon.py', + 'plugins/trayicon.plugin' + ], + install_dir: join_paths (pkglibdir, 'plugins') +) + +subdir ('po') +subdir ('doc/html') +subdir ('man') +subdir ('opml') +subdir ('pixmaps') +subdir ('src') +subdir ('xslt') +subdir ('glade') + +meson.add_install_script ('meson_post_install.py') diff --git a/meson_post_install.py b/meson_post_install.py new file mode 100644 index 000000000..bb14e4f0c --- /dev/null +++ b/meson_post_install.py @@ -0,0 +1,22 @@ +#!/usr/bin/python3 + +import os +import subprocess + +datadir = os.path.join (os.environ['MESON_INSTALL_PREFIX'], 'share') +icondir = os.path.join(datadir, 'icons', 'hicolor') +schemadir = os.path.join(datadir, 'glib-2.0', 'schemas') +desktopdir = os.path.join(datadir, 'applications') + +if not os.environ.get('DESTDIR'): + print('Compiling gsettings schemas...') + subprocess.call(['glib-compile-schemas', schemadir]) + + print('Updating icon cache...') + subprocess.call(['gtk-update-icon-cache', '-ft', icondir]) + + print('Updating desktop database...') + subprocess.call(['update-desktop-database', desktopdir]) +else: + print ('*** Icon cache not updated. After install, run this:') + print ('*** gtk-gtk_update_icon_cache -ft ' + icondir) diff --git a/net.sf.liferea.gschema.xml.in b/net.sf.liferea.gschema.xml similarity index 100% rename from net.sf.liferea.gschema.xml.in rename to net.sf.liferea.gschema.xml diff --git a/net.sourceforge.liferea.desktop.in b/net.sourceforge.liferea.desktop.in index 116e8c3b4..8733e28f5 100644 --- a/net.sourceforge.liferea.desktop.in +++ b/net.sourceforge.liferea.desktop.in @@ -1,9 +1,9 @@ [Desktop Entry] -_Name=Liferea -_GenericName=Feed Reader -_X-GNOME-FullName=Liferea Feed Reader -_Comment=Read news feeds and blogs -_Keywords=news;feed;aggregator;blog;podcast; +Name=Liferea +GenericName=Feed Reader +X-GNOME-FullName=Liferea Feed Reader +Comment=Read news feeds and blogs +Keywords=news;feed;aggregator;blog;podcast; Exec=liferea %U DBusActivatable=true Icon=liferea diff --git a/net.sourceforge.liferea.service.in b/net.sourceforge.liferea.service.in new file mode 100644 index 000000000..e3fcc8c99 --- /dev/null +++ b/net.sourceforge.liferea.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=net.sourceforge.liferea +Exec=@bindir@/liferea --gapplication-service diff --git a/opml/Makefile.am b/opml/Makefile.am deleted file mode 100644 index 85ff27741..000000000 --- a/opml/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -EXTRA_DIST = \ - feedlist_en.opml \ - feedlist_bg.opml \ - feedlist_ca.opml \ - feedlist_de.opml \ - feedlist_es.opml \ - feedlist_eu.opml \ - feedlist_fr.opml \ - feedlist_he.opml \ - feedlist_hu.opml \ - feedlist_gl.opml \ - feedlist_id.opml \ - feedlist_it.opml \ - feedlist_pl.opml \ - feedlist_pt.opml \ - feedlist_pt_BR.opml \ - feedlist_sk.opml \ - feedlist_sv.opml \ - feedlist_nl.opml \ - feedlist_no.opml - -lifereadistopmldir = $(datadir)/liferea/opml -lifereadistopml_DATA = $(EXTRA_DIST) diff --git a/opml/meson.build b/opml/meson.build new file mode 100644 index 000000000..74c3981a9 --- /dev/null +++ b/opml/meson.build @@ -0,0 +1,24 @@ +install_data ( + [ + 'feedlist_en.opml', + 'feedlist_bg.opml', + 'feedlist_ca.opml', + 'feedlist_de.opml', + 'feedlist_es.opml', + 'feedlist_eu.opml', + 'feedlist_fr.opml', + 'feedlist_he.opml', + 'feedlist_hu.opml', + 'feedlist_gl.opml', + 'feedlist_id.opml', + 'feedlist_it.opml', + 'feedlist_pl.opml', + 'feedlist_pt.opml', + 'feedlist_pt_BR.opml', + 'feedlist_sk.opml', + 'feedlist_sv.opml', + 'feedlist_nl.opml', + 'feedlist_no.opml' + ], + install_dir: join_paths (pkgdatadir, 'opml') +) diff --git a/pixmaps/16x16/Makefile.am b/pixmaps/16x16/Makefile.am deleted file mode 100644 index d9c2a2b8f..000000000 --- a/pixmaps/16x16/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 16x16 -context = apps -EXTRA_DIST = liferea.png -lifereadistpixdir = $(themedir)/$(size)/$(context) -lifereadistpix_DATA = $(EXTRA_DIST) diff --git a/pixmaps/22x22/Makefile.am b/pixmaps/22x22/Makefile.am deleted file mode 100644 index e273de4a4..000000000 --- a/pixmaps/22x22/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 22x22 -context = apps -EXTRA_DIST = liferea.png -lifereadistpixdir = $(themedir)/$(size)/$(context) -lifereadistpix_DATA = $(EXTRA_DIST) diff --git a/pixmaps/24x24/Makefile.am b/pixmaps/24x24/Makefile.am deleted file mode 100644 index cab4e613f..000000000 --- a/pixmaps/24x24/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 24x24 -context = apps -EXTRA_DIST = liferea.png -lifereadistpixdir = $(themedir)/$(size)/$(context) -lifereadistpix_DATA = $(EXTRA_DIST) diff --git a/pixmaps/32x32/Makefile.am b/pixmaps/32x32/Makefile.am deleted file mode 100644 index 3c26b594e..000000000 --- a/pixmaps/32x32/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 32x32 -context = apps -EXTRA_DIST = liferea.png -lifereadistpixdir = $(themedir)/$(size)/$(context) -lifereadistpix_DATA = $(EXTRA_DIST) diff --git a/pixmaps/48x48/Makefile.am b/pixmaps/48x48/Makefile.am deleted file mode 100644 index 3f580f0b1..000000000 --- a/pixmaps/48x48/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = 48x48 -context = apps -EXTRA_DIST = liferea.png -lifereadistpixdir = $(themedir)/$(size)/$(context) -lifereadistpix_DATA = $(EXTRA_DIST) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am deleted file mode 100644 index be236c9f3..000000000 --- a/pixmaps/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable -EXTRA_DIST = \ - mail-attachment.png \ - available.png \ - available_offline.png \ - default.png \ - folder.png \ - empty.png \ - empty_offline.png \ - emblem-important.png \ - unread.png \ - folder-saved-search.png \ - fl_opml.png \ - newsbin.png - -lifereadistpixdir = $(datadir)/$(PACKAGE)/pixmaps -lifereadistpix_DATA = $(EXTRA_DIST) - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi diff --git a/pixmaps/16x16/liferea.png b/pixmaps/hicolor/16x16/apps/liferea.png similarity index 100% rename from pixmaps/16x16/liferea.png rename to pixmaps/hicolor/16x16/apps/liferea.png diff --git a/pixmaps/22x22/liferea.png b/pixmaps/hicolor/22x22/apps/liferea.png similarity index 100% rename from pixmaps/22x22/liferea.png rename to pixmaps/hicolor/22x22/apps/liferea.png diff --git a/pixmaps/24x24/liferea.png b/pixmaps/hicolor/24x24/apps/liferea.png similarity index 100% rename from pixmaps/24x24/liferea.png rename to pixmaps/hicolor/24x24/apps/liferea.png diff --git a/pixmaps/32x32/liferea.png b/pixmaps/hicolor/32x32/apps/liferea.png similarity index 100% rename from pixmaps/32x32/liferea.png rename to pixmaps/hicolor/32x32/apps/liferea.png diff --git a/pixmaps/48x48/liferea.png b/pixmaps/hicolor/48x48/apps/liferea.png similarity index 100% rename from pixmaps/48x48/liferea.png rename to pixmaps/hicolor/48x48/apps/liferea.png diff --git a/pixmaps/scalable/liferea-symbolic.svg b/pixmaps/hicolor/scalable/apps/liferea-symbolic.svg similarity index 100% rename from pixmaps/scalable/liferea-symbolic.svg rename to pixmaps/hicolor/scalable/apps/liferea-symbolic.svg diff --git a/pixmaps/scalable/liferea.svg b/pixmaps/hicolor/scalable/apps/liferea.svg similarity index 100% rename from pixmaps/scalable/liferea.svg rename to pixmaps/hicolor/scalable/apps/liferea.svg diff --git a/pixmaps/meson.build b/pixmaps/meson.build new file mode 100644 index 000000000..dcdb568c3 --- /dev/null +++ b/pixmaps/meson.build @@ -0,0 +1,22 @@ +install_subdir ('hicolor', + install_dir: join_paths (datadir, 'icons') +) + +pixmaps = [ + 'mail-attachment.png', + 'available.png', + 'available_offline.png', + 'default.png', + 'folder.png', + 'empty.png', + 'empty_offline.png', + 'emblem-important.png', + 'unread.png', + 'folder-saved-search.png', + 'fl_opml.png', + 'newsbin.png' +] + +install_data (pixmaps, + install_dir: join_paths (pkgdatadir, 'pixmaps') +) diff --git a/pixmaps/scalable/Makefile.am b/pixmaps/scalable/Makefile.am deleted file mode 100644 index 852a08f01..000000000 --- a/pixmaps/scalable/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -themedir = $(datadir)/icons/hicolor -size = scalable -context = apps -EXTRA_DIST = \ - liferea.svg \ - liferea-symbolic.svg -lifereadistpixdir = $(themedir)/$(size)/$(context) -lifereadistpix_DATA = $(EXTRA_DIST) diff --git a/po/POTFILES.in b/po/POTFILES similarity index 79% rename from po/POTFILES.in rename to po/POTFILES index 384734390..fc44e4f0e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES @@ -1,7 +1,3 @@ -[encoding: UTF-8] - -# List of source files containing translatable strings. - liferea.appdata.xml.in net.sourceforge.liferea.desktop.in xslt/feed.xml.in @@ -185,25 +181,25 @@ src/webkit/webkit.c src/webkit/liferea_web_view.c src/webkit/web_extension/liferea_web_extension.c src/webkit/web_extension/web_extension_main.c -[type: gettext/glade]glade/about.ui -[type: gettext/glade]glade/auth.ui -[type: gettext/glade]glade/enclosure_handler.ui -[type: gettext/glade]glade/google_source.ui -[type: gettext/glade]glade/inoreader_source.ui -[type: gettext/glade]glade/mainwindow.ui -[type: gettext/glade]glade/new_folder.ui -[type: gettext/glade]glade/new_newsbin.ui -[type: gettext/glade]glade/new_subscription.ui -[type: gettext/glade]glade/node_source.ui -[type: gettext/glade]glade/opml_source.ui -[type: gettext/glade]glade/prefs.ui -[type: gettext/glade]glade/properties.ui -[type: gettext/glade]glade/reedah_source.ui -[type: gettext/glade]glade/rename_node.ui -[type: gettext/glade]glade/search_folder.ui -[type: gettext/glade]glade/search.ui -[type: gettext/glade]glade/simple_search.ui -[type: gettext/glade]glade/simple_subscription.ui -[type: gettext/glade]glade/theoldreader_source.ui -[type: gettext/glade]glade/ttrss_source.ui -[type: gettext/glade]glade/update_monitor.ui +glade/about.ui +glade/auth.ui +glade/enclosure_handler.ui +glade/google_source.ui +glade/inoreader_source.ui +glade/mainwindow.ui +glade/new_folder.ui +glade/new_newsbin.ui +glade/new_subscription.ui +glade/node_source.ui +glade/opml_source.ui +glade/prefs.ui +glade/properties.ui +glade/reedah_source.ui +glade/rename_node.ui +glade/search_folder.ui +glade/search.ui +glade/simple_search.ui +glade/simple_subscription.ui +glade/theoldreader_source.ui +glade/ttrss_source.ui +glade/update_monitor.ui diff --git a/po/its/liferea_xslt.its b/po/its/liferea_xslt.its new file mode 100644 index 000000000..1e7d4dab9 --- /dev/null +++ b/po/its/liferea_xslt.its @@ -0,0 +1,4 @@ + + + + diff --git a/po/its/liferea_xslt.loc b/po/its/liferea_xslt.loc new file mode 100644 index 000000000..c10cb0988 --- /dev/null +++ b/po/its/liferea_xslt.loc @@ -0,0 +1,6 @@ + + + + + + diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 000000000..39b704f23 --- /dev/null +++ b/po/meson.build @@ -0,0 +1 @@ +i18n.gettext(meson.project_name(), preset: 'glib', data_dirs: '.') diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 68f75adef..000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -## Process this file with automake to produce Makefile.in - -SUBDIRS = parsers ui fl_sources webkit tests . - -AM_CPPFLAGS = \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DBIN_DIR=\""$(bindir)"\" \ - -I$(top_srcdir)/src \ - $(PACKAGE_CFLAGS) \ - $(INTROSPECTION_CFLAGS) - -bin_PROGRAMS = liferea -bin_SCRIPTS = liferea-add-feed - -liferea_SOURCES = \ - auth.c auth.h \ - auth_activatable.c auth_activatable.h \ - browser.c browser.h \ - browser_history.c browser_history.h \ - comments.c comments.h \ - common.c common.h \ - conf.c conf.h \ - date.c date.h \ - db.c db.h \ - dbus.c dbus.h \ - debug.c debug.h \ - enclosure.c enclosure.h \ - export.c export.h \ - favicon.c favicon.h \ - feed.c feed.h \ - feed_parser.c feed_parser.h \ - feedlist.c feedlist.h \ - folder.c folder.h \ - html.c html.h \ - htmlview.c htmlview.h \ - item.c item.h \ - item_history.c item_history.h \ - item_loader.c item_loader.h \ - item_state.c item_state.h \ - itemset.c itemset.h \ - itemlist.c itemlist.h \ - json.c json.h \ - liferea_application.c liferea_application.h \ - metadata.c metadata.h \ - migrate.c migrate.h \ - net.c net.h \ - net_monitor.c net_monitor.h \ - newsbin.c newsbin.h \ - node.c node.h \ - node_type.c node_type.h \ - node_view.h \ - plugins_engine.c plugins_engine.h \ - render.c render.h \ - rule.c rule.h \ - social.c social.h \ - subscription.c subscription.h \ - subscription_type.h \ - update.c update.h \ - main.c \ - vfolder.c vfolder.h \ - vfolder_loader.c vfolder_loader.h \ - xml.c xml.h - -liferea_LDADD = parsers/libliparsers.a \ - fl_sources/libliflsources.a \ - ui/libliui.a \ - webkit/libwebkit.a \ - $(PACKAGE_LIBS) \ - $(INTLLIBS) \ - $(WEBKIT_LIBS) \ - $(INTROSPECTION_LIBS) \ - -lm - -EXTRA_DIST = $(srcdir)/liferea-add-feed.in -DISTCLEANFILES = $(srcdir)/liferea-add-feed -AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = liferea-add-feed - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = Liferea-3.0.gir - -Liferea-3.0.gir: liferea$(EXEEXT) -INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir)/src --warn-all --accept-unprefixed --identifier-prefix=Liferea --verbose -Liferea_3_0_gir_NAMESPACE = Liferea -Liferea_3_0_gir_VERSION = 3.0 -Liferea_3_0_gir_PROGRAM = $(builddir)/liferea$(EXEEXT) -Liferea_3_0_gir_FILES = \ - auth.c auth.h \ - auth_activatable.c auth_activatable.h \ - enclosure.h \ - feedlist.c feedlist.h \ - item.h \ - itemlist.c itemlist.h \ - itemset.c itemset.h \ - node.h node.c \ - node_view.h \ - social.c social.h \ - subscription_type.h \ - ui/browser_tabs.c ui/browser_tabs.h \ - ui/icons.c ui/icons.h \ - ui/itemview.c ui/itemview.h \ - ui/item_list_view.c ui/item_list_view.h \ - ui/liferea_htmlview.c ui/liferea_htmlview.h \ - ui/liferea_shell.c ui/liferea_shell.h \ - ui/liferea_shell_activatable.c ui/liferea_shell_activatable.h \ - ui/media_player.c ui/media_player.h \ - ui/media_player_activatable.c ui/media_player_activatable.h \ - fl_sources/node_source.c fl_sources/node_source.h \ - fl_sources/node_source_activatable.c fl_sources/node_source_activatable.h -Liferea_3_0_gir_INCLUDES = Gtk-3.0 libxml2-2.0 -if HAVE_INTROSPECTION -girdir = $(datadir)/liferea/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/liferea/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES = \ - $(gir_DATA) \ - $(typelib_DATA) -endif diff --git a/src/common.h b/src/common.h index a7cd25b99..8a0cbe830 100644 --- a/src/common.h +++ b/src/common.h @@ -23,36 +23,13 @@ #define _COMMON_H #include +#include #include #include #include #include #include -/* - * Standard gettext macros - */ -#ifdef ENABLE_NLS -# include -# undef _ -# define _(String) dgettext (PACKAGE, String) -# define Q_(String) g_strip_context ((String), gettext (String)) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define Q_(String) g_strip_context ((String), (String)) -# define N_(String) (String) -#endif - /** * Parses the given string as a number. * diff --git a/src/fl_sources/Makefile.am b/src/fl_sources/Makefile.am deleted file mode 100644 index a5da329b9..000000000 --- a/src/fl_sources/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AM_CPPFLAGS = \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -I$(top_srcdir)/src \ - $(PACKAGE_CFLAGS) - -noinst_LIBRARIES = libliflsources.a -libliflsources_a_SOURCES = node_source.c node_source.h \ - node_source_activatable.c node_source_activatable.h \ - default_source.c default_source.h \ - dummy_source.c dummy_source.h \ - google_reader_api_edit.c google_reader_api_edit.h \ - google_reader_api.h \ - google_source.c google_source.h \ - inoreader_source.c inoreader_source.h \ - inoreader_source_feed.c \ - inoreader_source_feed_list.c inoreader_source_feed_list.h \ - json_api_mapper.c json_api_mapper.h \ - opml_source.c opml_source.h \ - reedah_source.c reedah_source.h \ - reedah_source_feed.c \ - reedah_source_feed_list.c reedah_source_feed_list.h \ - theoldreader_source.c theoldreader_source.h \ - theoldreader_source_feed.c \ - theoldreader_source_feed_list.c theoldreader_source_feed_list.h \ - ttrss_source.c ttrss_source.h \ - ttrss_source_feed.c \ - ttrss_source_feed_list.c ttrss_source_feed_list.h - -libliflsources_a_CFLAGS = $(PACKAGE_FLAGS) diff --git a/src/fl_sources/meson.build b/src/fl_sources/meson.build new file mode 100644 index 000000000..b1b362010 --- /dev/null +++ b/src/fl_sources/meson.build @@ -0,0 +1,29 @@ +liflsources_sources = [ + 'node_source.c', + 'node_source_activatable.c', + 'default_source.c', + 'dummy_source.c', + 'google_reader_api_edit.c', + 'google_source.c', + 'inoreader_source.c', + 'inoreader_source_feed.c', + 'inoreader_source_feed_list.c', + 'json_api_mapper.c', + 'opml_source.c', + 'reedah_source.c', + 'reedah_source_feed.c', + 'reedah_source_feed_list.c', + 'theoldreader_source.c', + 'theoldreader_source_feed.c', + 'theoldreader_source_feed_list.c', + 'ttrss_source.c', + 'ttrss_source_feed.c', + 'ttrss_source_feed_list.c' +] + +liflsources = static_library ('liflsources', + liflsources_sources, + dependencies : liferea_deps, + include_directories : src_inc, + install : false +) diff --git a/src/liferea-add-feed.in b/src/liferea-add-feed.in old mode 100644 new mode 100755 diff --git a/src/main.c b/src/main.c index 744e6b838..21c01fe9e 100644 --- a/src/main.c +++ b/src/main.c @@ -19,9 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include @@ -63,11 +61,9 @@ main (int argc, char *argv[]) signal (SIGHUP, signal_handler); #endif -#ifdef ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); -#endif liferea_app = liferea_application_new (); g_set_prgname ("liferea"); diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 000000000..07f7bc136 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,111 @@ +# The .. is to include config.h +src_inc = include_directories ('.', '..') + +subdir ('parsers') +subdir ('ui') +subdir ('fl_sources') +subdir ('webkit') + +liferea_sources = [ + 'auth.c', + 'auth_activatable.c', + 'browser.c', + 'browser_history.c', + 'comments.c', + 'common.c', + 'conf.c', + 'date.c', + 'db.c', + 'dbus.c', + 'debug.c', + 'enclosure.c', + 'export.c', + 'favicon.c', + 'feed.c', + 'feed_parser.c', + 'feedlist.c', + 'folder.c', + 'html.c', + 'htmlview.c', + 'item.c', + 'item_history.c', + 'item_loader.c', + 'item_state.c', + 'itemset.c', + 'itemlist.c', + 'json.c', + 'liferea_application.c', + 'metadata.c', + 'migrate.c', + 'net.c', + 'net_monitor.c', + 'newsbin.c', + 'node.c', + 'node_type.c', + 'plugins_engine.c', + 'render.c', + 'rule.c', + 'social.c', + 'subscription.c', + 'update.c', + 'main.c', + 'vfolder.c', + 'vfolder_loader.c', + 'xml.c' +] + +liferea_exe = executable ('liferea', liferea_sources, + dependencies : liferea_deps, + include_directories : src_inc, + link_with : [liparsers, liui, liflsources, liwebkit], + install: true +) + +scriptconf = configuration_data () +scriptconf.set ('prefix', prefix) + +configure_file (input: 'liferea-add-feed.in', + output: 'liferea-add-feed', + configuration : scriptconf, + install: true, + install_dir: bindir +) + +gir_files = [ + 'auth.c', 'auth.h', + 'auth_activatable.c', 'auth_activatable.h', + 'enclosure.h', + 'feedlist.c', 'feedlist.h', + 'item.h', + 'itemlist.c', 'itemlist.h', + 'itemset.c', 'itemset.h', + 'node.h', 'node.c', + 'node_view.h', + 'social.c', 'social.h', + 'subscription_type.h', + 'ui/browser_tabs.c', 'ui/browser_tabs.h', + 'ui/icons.c', 'ui/icons.h', + 'ui/itemview.c', 'ui/itemview.h', + 'ui/item_list_view.c', 'ui/item_list_view.h', + 'ui/liferea_htmlview.c', 'ui/liferea_htmlview.h', + 'ui/liferea_shell.c', 'ui/liferea_shell.h', + 'ui/liferea_shell_activatable.c', 'ui/liferea_shell_activatable.h', + 'ui/media_player.c', 'ui/media_player.h', + 'ui/media_player_activatable.c', 'ui/media_player_activatable.h', + 'fl_sources/node_source.c', 'fl_sources/node_source.h', + 'fl_sources/node_source_activatable.c', 'fl_sources/node_source_activatable.h' +] + +gnome.generate_gir ( liferea_exe, + sources: gir_files, + namespace: 'Liferea', + nsversion: '3.0', + includes: ['Gtk-3.0', 'libxml2-2.0'], + identifier_prefix: 'Liferea', + extra_args: ['--warn-all', '--accept-unprefixed', '--verbose'], + install: true, + install_dir_gir: join_paths (pkgdatadir, 'gir-1.0'), + install_dir_typelib: join_paths (pkglibdir, 'girepository-1.0') +) + +subdir ('tests') diff --git a/src/parsers/Makefile.am b/src/parsers/Makefile.am deleted file mode 100644 index a586b78a6..000000000 --- a/src/parsers/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AM_CPPFLAGS = \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -I$(top_srcdir)/src \ - $(PACKAGE_CFLAGS) - -noinst_LIBRARIES = libliparsers.a - -libliparsers_a_CFLAGS = $(PACKAGE_FLAGS) -libliparsers_a_SOURCES = \ - atom10.c atom10.h \ - cdf_channel.c cdf_channel.h \ - cdf_item.c cdf_item.h \ - ns_admin.c ns_admin.h \ - ns_ag.c ns_ag.h \ - ns_blogChannel.c ns_blogChannel.h \ - ns_cC.c ns_cC.h \ - ns_content.c ns_content.h \ - ns_dc.c ns_dc.h \ - ns_georss.c ns_georss.h \ - ns_itunes.c ns_itunes.h \ - ns_media.c ns_media.h \ - ns_photo.c ns_photo.h \ - ns_slash.c ns_slash.h \ - ns_syn.c ns_syn.h \ - ns_trackback.c ns_trackback.h \ - ns_wfw.c ns_wfw.h \ - pie_entry.c pie_entry.h \ - pie_feed.c pie_feed.h \ - rss_channel.c rss_channel.h \ - rss_item.c rss_item.h diff --git a/src/parsers/meson.build b/src/parsers/meson.build new file mode 100644 index 000000000..02b0fe631 --- /dev/null +++ b/src/parsers/meson.build @@ -0,0 +1,30 @@ +liparsers_sources = [ + 'atom10.c', + 'cdf_channel.c', + 'cdf_item.c', + 'ns_admin.c', + 'ns_ag.c', + 'ns_blogChannel.c', + 'ns_cC.c', + 'ns_content.c', + 'ns_dc.c', + 'ns_georss.c', + 'ns_itunes.c', + 'ns_media.c', + 'ns_photo.c', + 'ns_slash.c', + 'ns_syn.c', + 'ns_trackback.c', + 'ns_wfw.c', + 'pie_entry.c', + 'pie_feed.c', + 'rss_channel.c', + 'rss_item.c' +] + +liparsers = static_library ('liparsers', + liparsers_sources, + include_directories : src_inc, + dependencies : liferea_deps, + install : false, +) diff --git a/src/plugins_engine.c b/src/plugins_engine.c index 0b0cc1b7b..6a84207ae 100644 --- a/src/plugins_engine.c +++ b/src/plugins_engine.c @@ -22,9 +22,7 @@ * Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H #include -#endif #include diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am deleted file mode 100644 index 70cb7e432..000000000 --- a/src/tests/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -## Process this file with automake to produce Makefile.in - -noinst_PROGRAMS = $(TEST_PROGS) - -TEST_PROGS = html_auto parse_date - -test: $(TEST_PROGS) - echo $(TEST_PROGS) | sed "s/^/.\//;s/ / \&\& .\//" | xargs -I{} sh -c "{}" -.PHONY: test - -AM_CPPFLAGS = \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DBIN_DIR=\""$(bindir)"\" \ - -I$(top_srcdir)/src \ - $(PACKAGE_CFLAGS) \ - $(INTROSPECTION_CFLAGS) - -progs_ldadd = ../parsers/libliparsers.a \ - ../fl_sources/libliflsources.a \ - ../ui/libliui.a \ - ../webkit/libwebkit.a \ - $(PACKAGE_LIBS) \ - $(INTLLIBS) \ - $(WEBKIT_LIBS) \ - $(INTROSPECTION_LIBS) \ - -lm - -html_auto_SOURCES = html.c -html_auto_LDADD = $(progs_ldadd) ../html.o ../common.o ../debug.o ../xml.o - -parse_date_SOURCES = parse_date.c -parse_date_LDADD = $(progs_ldadd) ../date.o ../common.o ../debug.o - -#item_SOURCES = item.c -#item_LDADD = $(progs_ldadd) ../item.o ../metadata.o ../xml.o ../debug.o ../common.o ../date.o ../node.o - diff --git a/src/tests/meson.build b/src/tests/meson.build new file mode 100644 index 000000000..4a02b437d --- /dev/null +++ b/src/tests/meson.build @@ -0,0 +1,21 @@ +html_test_obj = liferea_exe.extract_objects ('html.c', 'common.c', 'debug.c', 'xml.c') + +html_auto = executable ('html_auto', 'html.c', + objects: html_test_obj, + dependencies : liferea_deps, + include_directories : src_inc, + install : false +) + +test ('html_test', html_auto) + +date_test_obj = liferea_exe.extract_objects ('date.c', 'common.c', 'debug.c') + +parse_date = executable ('parse_date', 'parse_date.c', + objects: date_test_obj, + dependencies : liferea_deps, + include_directories : src_inc, + install : false +) + +test ('parse_date_test', parse_date) diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am deleted file mode 100644 index 4eaf5f7aa..000000000 --- a/src/ui/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AM_CPPFLAGS = \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -I$(top_srcdir)/src - -noinst_LIBRARIES = libliui.a - -libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) -libliui_a_SOURCES = \ - auth_dialog.c auth_dialog.h \ - browser_tabs.c browser_tabs.h \ - enclosure_list_view.c enclosure_list_view.h \ - feed_list_view.c feed_list_view.h \ - feed_list_node.c feed_list_node.h \ - gedit-close-button.c gedit-close-button.h \ - icons.c icons.h \ - item_list_view.c item_list_view.h \ - itemview.c itemview.h \ - liferea_dialog.c liferea_dialog.h \ - liferea_htmlview.c liferea_htmlview.h \ - liferea_shell.c liferea_shell.h \ - liferea_shell_activatable.c liferea_shell_activatable.h \ - media_player.c media_player.h \ - media_player_activatable.c media_player_activatable.h \ - popup_menu.c popup_menu.h \ - preferences_dialog.c preferences_dialog.h \ - rule_editor.c rule_editor.h \ - search_dialog.c search_dialog.h \ - search_folder_dialog.c search_folder_dialog.h \ - subscription_dialog.c subscription_dialog.h \ - ui_common.c ui_common.h \ - ui_dnd.c ui_dnd.h \ - ui_folder.c ui_folder.h \ - ui_update.c ui_update.h diff --git a/src/ui/liferea_dialog.c b/src/ui/liferea_dialog.c index 19dde1ec0..51ccc119f 100644 --- a/src/ui/liferea_dialog.c +++ b/src/ui/liferea_dialog.c @@ -18,9 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include diff --git a/src/ui/meson.build b/src/ui/meson.build new file mode 100644 index 000000000..d984501f3 --- /dev/null +++ b/src/ui/meson.build @@ -0,0 +1,33 @@ +liui_sources = [ + 'auth_dialog.c', + 'browser_tabs.c', + 'enclosure_list_view.c', + 'feed_list_view.c', + 'feed_list_node.c', + 'gedit-close-button.c', + 'icons.c', + 'item_list_view.c', + 'itemview.c', + 'liferea_dialog.c', + 'liferea_htmlview.c', + 'liferea_shell.c', + 'liferea_shell_activatable.c', + 'media_player.c', + 'media_player_activatable.c', + 'popup_menu.c', + 'preferences_dialog.c', + 'rule_editor.c', + 'search_dialog.c', + 'search_folder_dialog.c', + 'subscription_dialog.c', + 'ui_common.c', + 'ui_dnd.c', + 'ui_folder.c', + 'ui_update.c' +] + +liui = static_library ('liui', liui_sources, + include_directories : src_inc, + dependencies : liferea_deps, + install : false +) diff --git a/src/webkit/Makefile.am b/src/webkit/Makefile.am deleted file mode 100644 index 3f15e94a2..000000000 --- a/src/webkit/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in - -SUBDIRS = web_extension -AM_CPPFLAGS = -I$(top_srcdir)/src $(PACKAGE_CFLAGS) $(WEBKIT_CFLAGS) -DWEB_EXTENSIONS_DIR=\""$(pkglibdir)/web-extension"\" - -noinst_LIBRARIES = libwebkit.a - -libwebkit_a_SOURCES = webkit.c liferea_web_view.c liferea_web_view.h -libwebkit_a_CFLAGS = $(PACKAGE_CFLAGS) $(WEBKIT_CFLAGS) - diff --git a/src/webkit/meson.build b/src/webkit/meson.build new file mode 100644 index 000000000..29c31e55f --- /dev/null +++ b/src/webkit/meson.build @@ -0,0 +1,14 @@ +liwebkit_sources = [ + 'webkit.c', + 'liferea_web_view.c' +] + +liwebkit = static_library ( + 'liwebkit', + liwebkit_sources, + dependencies : liferea_deps, + include_directories : src_inc, + install : false +) + +subdir ('web_extension') diff --git a/src/webkit/web_extension/Makefile.am b/src/webkit/web_extension/Makefile.am deleted file mode 100644 index 2de2a45c7..000000000 --- a/src/webkit/web_extension/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -webextension_LTLIBRARIES = liblifereawebextension.la - -webextensiondir = $(pkglibdir)/web-extension - -liblifereawebextension_la_SOURCES = web_extension_main.c liferea_web_extension.c liferea_web_extension.h liferea_web_extension_names.h -liblifereawebextension_la_CFLAGS = $(WEB_EXTENSION_CFLAGS) -liblifereawebextension_la_LIBADD = $(WEB_EXTENSION_LIBS) -liblifereawebextension_la_LDFLAGS = -module -avoid-version -no-undefined diff --git a/src/webkit/web_extension/meson.build b/src/webkit/web_extension/meson.build new file mode 100644 index 000000000..dee60b000 --- /dev/null +++ b/src/webkit/web_extension/meson.build @@ -0,0 +1,11 @@ +lifereawebextension_sources = [ + 'web_extension_main.c', + 'liferea_web_extension.c' +] + +lifereawebextension = shared_module ('lifereawebextension', + lifereawebextension_sources, + dependencies : webextension_deps, + install: true, + install_dir: join_paths (pkglibdir, 'web-extension') +) diff --git a/xslt/Makefile.am b/xslt/Makefile.am deleted file mode 100644 index abc29b4c7..000000000 --- a/xslt/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -xslt_in_files = item.xml.in \ - feed.xml.in \ - source.xml.in \ - folder.xml.in \ - newsbin.xml.in \ - vfolder.xml.in - -xslt_files = $(xslt_in_files:.xml.in=.xml) i18n-filter.xslt -xsltdir = $(pkgdatadir)/xslt -xslt_DATA = $(xslt_files) -@INTLTOOL_XML_RULE@ - -EXTRA_DIST = \ - $(xslt_DATA) $(xslt_in_files) - -DISTCLEANFILES = $(xslt_in_files:.xml.in=.xml) diff --git a/xslt/feed.xml.in b/xslt/feed.xml.in index 89277ea42..249b0b278 100644 --- a/xslt/feed.xml.in +++ b/xslt/feed.xml.in @@ -45,7 +45,7 @@
- <_span>This feed is discontinued. It's no longer available. Liferea won't update it anymore but you can still access the cached headlines. + This feed is discontinued. It's no longer available. Liferea won't update it anymore but you can still access the cached headlines.
@@ -57,42 +57,42 @@
- <_span>The last update of this subscription failed!
HTTP error code : + The last update of this subscription failed!
HTTP error code :
- <_span>There were errors while parsing this feed! + There were errors while parsing this feed! ( - <_span>Parser Error Details + Parser Error Details ) - <_span>Details
+ Details
-
<_span>You may want to contact the author/webmaster of the feed about this! +
You may want to contact the author/webmaster of the feed about this!
- <_span>There were errors while filtering this feed! + There were errors while filtering this feed! ( - <_span>Filter Error Details + Filter Error Details ) - <_span>Details
+ Details
 @@ -106,7 +106,7 @@
- <_span>Feed: + Feed: @@ -116,7 +116,7 @@
- <_span>Source: + Source: @@ -138,7 +138,7 @@
- <_span>Publisher + Publisher @@ -148,7 +148,7 @@
- <_span>Copyright + Copyright diff --git a/xslt/folder.xml.in b/xslt/folder.xml.in index e4c24d348..7c96d07c1 100644 --- a/xslt/folder.xml.in +++ b/xslt/folder.xml.in @@ -40,7 +40,7 @@
- <_span>Folder: + Folder: @@ -51,9 +51,9 @@

- <_span>children with + children with - <_span>unread headlines + unread headlines

diff --git a/xslt/item.xml.in b/xslt/item.xml.in index 7f5f4e907..122381e83 100644 --- a/xslt/item.xml.in +++ b/xslt/item.xml.in @@ -135,7 +135,7 @@
- <_span>Source + Source @@ -150,7 +150,7 @@
- <_span>Feed + Feed @@ -163,7 +163,7 @@
- <_span>Filed under + Filed under , @@ -177,7 +177,7 @@
- <_span>Author + Author @@ -188,7 +188,7 @@
- <_span>Shared by + Shared by @@ -200,7 +200,7 @@
- <_span>Via + Via @@ -212,7 +212,7 @@
- <_span>Related + Related @@ -226,7 +226,7 @@
- <_span>Also posted in + Also posted in @@ -237,7 +237,7 @@
- <_span>Creator + Creator @@ -250,13 +250,13 @@
- <_span>Coordinates + Coordinates ,
- <_span>Map + Map OpenStreeMap @@ -300,13 +300,13 @@

- <_span>Comments + Comments ( - <_span>Updating... + Updating... )

@@ -340,9 +340,9 @@ - <_span>Section + Section - <_span>Department + Department diff --git a/xslt/meson.build b/xslt/meson.build new file mode 100644 index 000000000..4f6eb8dec --- /dev/null +++ b/xslt/meson.build @@ -0,0 +1,23 @@ +xslt_files = [ + 'item.xml', + 'feed.xml', + 'source.xml', + 'folder.xml', + 'newsbin.xml', + 'vfolder.xml' +] + +foreach file : xslt_files + i18n.merge_file ( + input: file + '.in', + output: file, + po_dir: '../po', + data_dirs: '../po', + install: true, + install_dir: join_paths (pkgdatadir, 'xslt') + ) +endforeach + +install_data ('i18n-filter.xslt', + install_dir: join_paths (pkgdatadir, 'xslt') +) diff --git a/xslt/newsbin.xml.in b/xslt/newsbin.xml.in index 8f2775040..1bc0d790e 100644 --- a/xslt/newsbin.xml.in +++ b/xslt/newsbin.xml.in @@ -43,7 +43,7 @@
- <_span>News Bin: + News Bin: @@ -53,7 +53,7 @@

-<_span>Add items to this news bin by selecting "Copy to News Bin" from the item list context menu. +Add items to this news bin by selecting "Copy to News Bin" from the item list context menu.

diff --git a/xslt/source.xml.in b/xslt/source.xml.in index 1106c62e8..66a5c1e53 100644 --- a/xslt/source.xml.in +++ b/xslt/source.xml.in @@ -40,7 +40,7 @@
- <_span>Source: + Source: @@ -51,9 +51,9 @@

- <_span>children with + children with - <_span>unread headlines + unread headlines

diff --git a/xslt/vfolder.xml.in b/xslt/vfolder.xml.in index beb3e2f3b..d4f9ac1e2 100644 --- a/xslt/vfolder.xml.in +++ b/xslt/vfolder.xml.in @@ -40,7 +40,7 @@
- <_span>Search Folder: + Search Folder: @@ -51,7 +51,7 @@

- <_span>unread headlines + unread headlines