[gnote: 127/127] Merge branch 'meson'




commit b1ccabf4092822ac98b39859f64f4f7547aa1dab
Merge: 2740687c c6ea17f6
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Fri Apr 9 22:19:11 2021 +0300

    Merge branch 'meson'

 .gitignore                                         |   2 +-
 Makefile.am                                        |  19 -
 autogen.sh                                         |  40 -
 config.h.in                                        |  10 +
 configure.ac                                       | 213 -----
 data/Makefile.am                                   |  53 --
 data/appdata/Makefile.am                           |  13 -
 data/icons/Makefile.am                             | 120 ---
 data/icons/meson.build                             |  36 +
 data/meson.build                                   |  58 ++
 data/org.gnome.Gnote.desktop.in                    |  13 +
 data/org.gnome.Gnote.desktop.in.in                 |  17 -
 data/{appdata => }/org.gnome.gnote.appdata.xml.in  |  12 +-
 data/org.gnome.gnote.gschema.xml                   | 228 +++++
 data/org.gnome.gnote.gschema.xml.in                | 228 -----
 data/{ui => }/shortcuts-gnote.ui                   |   0
 data/ui/Makefile.am                                |   8 -
 help/LINGUAS                                       |  15 +
 help/Makefile.am                                   |  56 --
 help/meson.build                                   |  58 ++
 m4/ax_cxx_compile_stdcxx.m4                        | 948 ---------------------
 m4/ax_cxx_compile_stdcxx_14.m4                     |  34 -
 m4/ax_require_defined.m4                           |  37 -
 meson.build                                        |  66 ++
 po/POTFILES.in                                     |  98 +--
 po/POTFILES.skip                                   |  43 -
 po/meson.build                                     |  10 +
 post-install.py                                    |  19 +
 src/Makefile.am                                    | 172 ----
 src/addininfo.cpp                                  |  18 +-
 src/addinmanager.cpp                               |   6 +-
 src/addins/Makefile.am                             |  25 -
 src/addins/addins.mk.in                            |  13 -
 src/addins/backlinks/Makefile.am                   |  18 -
 src/addins/backlinks/backlinks.desktop.in.in       |  14 -
 src/addins/bugzilla/Makefile.am                    |  26 -
 src/addins/bugzilla/bugzilla.desktop.in.in         |  11 -
 src/addins/exporttogtg/Makefile.am                 |  18 -
 src/addins/exporttogtg/exporttogtg.desktop.in.in   |  14 -
 src/addins/exporttohtml/Makefile.am                |  28 -
 src/addins/exporttohtml/exporttohtml.desktop.in.in |  14 -
 src/addins/filesystemsyncservice/Makefile.am       |  18 -
 .../filesystemsyncservice.desktop.in.in            |  11 -
 src/addins/fixedwidth/Makefile.am                  |  19 -
 src/addins/fixedwidth/fixedwidth.desktop.in.in     |  13 -
 src/addins/gvfssyncservice/Makefile.am             |  18 -
 .../gvfssyncservice/gvfssyncservice.desktop.in.in  |  11 -
 src/addins/inserttimestamp/Makefile.am             |  21 -
 .../inserttimestamp/inserttimestamp.desktop.in.in  |  13 -
 src/addins/notedirectorywatcher/Makefile.am        |  21 -
 .../notedirectorywatcher.desktop.in.in             |  11 -
 src/addins/noteoftheday/Makefile.am                |  24 -
 src/addins/noteoftheday/noteoftheday.desktop.in.in |  11 -
 src/addins/printnotes/Makefile.am                  |  18 -
 src/addins/printnotes/printnotes.desktop.in.in     |  14 -
 src/addins/readonly/Makefile.am                    |  19 -
 src/addins/readonly/readonly.desktop.in.in         |  14 -
 src/addins/replacetitle/Makefile.am                |  19 -
 src/addins/replacetitle/replacetitle.desktop.in.in |  13 -
 src/addins/specialnotes/Makefile.am                |  19 -
 src/addins/specialnotes/specialnotes.desktop.in.in |  11 -
 src/addins/statistics/Makefile.am                  |  20 -
 src/addins/statistics/statistics.desktop.in.in     |  13 -
 src/addins/stickynoteimport/Makefile.am            |  18 -
 .../stickynoteimport.desktop.in.in                 |  13 -
 src/addins/tableofcontents/Makefile.am             |  25 -
 .../tableofcontents/tableofcontents.desktop.in.in  |  16 -
 src/addins/todo/Makefile.am                        |  19 -
 src/addins/todo/todo.desktop.in.in                 |  11 -
 src/addins/tomboyimport/Makefile.am                |  18 -
 src/addins/tomboyimport/tomboyimport.desktop.in.in |  13 -
 src/addins/underline/Makefile.am                   |  19 -
 src/addins/underline/underline.desktop.in.in       |  13 -
 src/addins/webdavsyncservice/Makefile.am           |  16 -
 .../webdavsyncservice.desktop.in.in                |  11 -
 src/dbus/Makefile.am                               |  10 -
 src/dbus/meson.build                               |   5 +
 src/gnote.cpp                                      |   6 +
 src/gnote.hpp                                      |   1 +
 src/meson.build                                    | 118 +++
 src/plugins/backlinks/backlinks.desktop.in.in      |  14 +
 .../backlinks/backlinksnoteaddin.cpp               |   0
 .../backlinks/backlinksnoteaddin.hpp               |   0
 src/plugins/backlinks/meson.build                  |  27 +
 src/{addins => plugins}/bugzilla/bug.png           | Bin
 src/plugins/bugzilla/bugzilla.desktop.in.in        |  11 +
 src/{addins => plugins}/bugzilla/bugzillalink.cpp  |   0
 src/{addins => plugins}/bugzilla/bugzillalink.hpp  |   0
 .../bugzilla/bugzillanoteaddin.cpp                 |   0
 .../bugzilla/bugzillanoteaddin.hpp                 |   0
 .../bugzilla/bugzillapreferences.cpp               |   0
 .../bugzilla/bugzillapreferences.hpp               |   0
 .../bugzilla/bugzillapreferencesfactory.hpp        |   0
 .../bugzilla/insertbugaction.cpp                   |   0
 .../bugzilla/insertbugaction.hpp                   |   0
 src/plugins/bugzilla/meson.build                   |  35 +
 src/plugins/exporttogtg/exporttogtg.desktop.in.in  |  14 +
 .../exporttogtg/exporttogtgnoteaddin.cpp           |   0
 .../exporttogtg/exporttogtgnoteaddin.hpp           |   0
 src/plugins/exporttogtg/meson.build                |  27 +
 .../exporttohtml/exporttohtml.desktop.in.in        |  14 +
 .../exporttohtml/exporttohtml.xsl                  |   0
 .../exporttohtml/exporttohtmldialog.cpp            |   0
 .../exporttohtml/exporttohtmldialog.hpp            |   0
 .../exporttohtml/exporttohtmlnoteaddin.cpp         |   3 +-
 .../exporttohtml/exporttohtmlnoteaddin.hpp         |   0
 src/plugins/exporttohtml/meson.build               |  32 +
 .../exporttohtml/notenameresolver.hpp              |   0
 .../filesystemsyncservice.desktop.in.in            |  11 +
 .../filesystemsyncserviceaddin.cpp                 |   0
 .../filesystemsyncserviceaddin.hpp                 |   0
 src/plugins/filesystemsyncservice/meson.build      |  27 +
 src/plugins/fixedwidth/fixedwidth.desktop.in.in    |  13 +
 .../fixedwidth/fixedwidthnoteaddin.cpp             |   0
 .../fixedwidth/fixedwidthnoteaddin.hpp             |   0
 .../fixedwidth/fixedwidthtag.hpp                   |   0
 src/plugins/fixedwidth/meson.build                 |  27 +
 .../gvfssyncservice/gvfssyncservice.desktop.in.in  |  11 +
 .../gvfssyncservice/gvfssyncserviceaddin.cpp       |   0
 .../gvfssyncservice/gvfssyncserviceaddin.hpp       |   0
 src/plugins/gvfssyncservice/meson.build            |  27 +
 .../inserttimestamp/inserttimestamp.desktop.in.in  |  13 +
 .../inserttimestamp/inserttimestampnoteaddin.cpp   |   0
 .../inserttimestamp/inserttimestampnoteaddin.hpp   |   0
 .../inserttimestamp/inserttimestamppreferences.cpp |   0
 .../inserttimestamp/inserttimestamppreferences.hpp |   0
 .../inserttimestamppreferencesfactory.hpp          |   0
 src/plugins/inserttimestamp/meson.build            |  30 +
 src/plugins/meson.build                            |  40 +
 src/plugins/notedirectorywatcher/meson.build       |  30 +
 .../notedirectorywatcher.desktop.in.in             |  11 +
 .../notedirectorywatcherapplicationaddin.cpp       |   0
 .../notedirectorywatcherapplicationaddin.hpp       |   0
 .../notedirectorywatcherpreferences.cpp            |   0
 .../notedirectorywatcherpreferences.hpp            |   0
 .../notedirectorywatcherpreferencesfactory.hpp     |   0
 src/plugins/noteoftheday/meson.build               |  31 +
 .../noteoftheday/noteoftheday.cpp                  |   0
 .../noteoftheday/noteoftheday.desktop.in.in        |  11 +
 .../noteoftheday/noteoftheday.hpp                  |   0
 .../noteoftheday/noteofthedayapplicationaddin.cpp  |   0
 .../noteoftheday/noteofthedayapplicationaddin.hpp  |   0
 .../noteoftheday/noteofthedaypreferences.cpp       |   0
 .../noteoftheday/noteofthedaypreferences.hpp       |   0
 .../noteofthedaypreferencesfactory.hpp             |   0
 src/plugins/printnotes/meson.build                 |  27 +
 src/plugins/printnotes/printnotes.desktop.in.in    |  14 +
 .../printnotes/printnotesnoteaddin.cpp             |   0
 .../printnotes/printnotesnoteaddin.hpp             |   0
 src/plugins/readonly/meson.build                   |  27 +
 src/plugins/readonly/readonly.desktop.in.in        |  14 +
 .../readonly/readonlynoteaddin.cpp                 |   0
 .../readonly/readonlynoteaddin.hpp                 |   0
 src/plugins/replacetitle/meson.build               |  27 +
 .../replacetitle/replacetitle.desktop.in.in        |  13 +
 .../replacetitle/replacetitlenoteaddin.cpp         |   0
 .../replacetitle/replacetitlenoteaddin.hpp         |   0
 src/plugins/specialnotes/meson.build               |  27 +
 .../specialnotes/specialnotes.desktop.in.in        |  11 +
 .../specialnotes/specialnotesapplicationaddin.cpp  |   0
 .../specialnotes/specialnotesapplicationaddin.hpp  |   0
 src/plugins/statistics/meson.build                 |  30 +
 src/plugins/statistics/statistics.desktop.in.in    |  13 +
 .../statistics/statisticsapplicationaddin.cpp      |   0
 .../statistics/statisticsapplicationaddin.hpp      |   0
 .../statistics/statisticswidget.cpp                |   0
 .../statistics/statisticswidget.hpp                |   0
 src/plugins/stickynoteimport/meson.build           |  27 +
 .../stickynoteimport.desktop.in.in                 |  13 +
 .../stickynoteimport/stickynoteimportnoteaddin.cpp |   0
 .../stickynoteimport/stickynoteimportnoteaddin.hpp |   0
 src/{addins => plugins}/tableofcontents/HACKING    |   0
 src/{addins => plugins}/tableofcontents/NEWS       |   0
 src/{addins => plugins}/tableofcontents/TODO       |   0
 src/plugins/tableofcontents/meson.build            |  31 +
 .../tableofcontents/tableofcontents.desktop.in.in  |  16 +
 .../tableofcontents/tableofcontents.hpp            |   0
 .../tableofcontents/tableofcontentsmenuitem.cpp    |   0
 .../tableofcontents/tableofcontentsmenuitem.hpp    |   0
 .../tableofcontents/tableofcontentsnoteaddin.cpp   |   0
 .../tableofcontents/tableofcontentsnoteaddin.hpp   |   0
 .../tableofcontents/tableofcontentsutils.cpp       |   0
 .../tableofcontents/tableofcontentsutils.hpp       |   0
 src/plugins/todo/meson.build                       |  27 +
 src/plugins/todo/todo.desktop.in.in                |  11 +
 src/{addins => plugins}/todo/todonoteaddin.cpp     |   0
 src/{addins => plugins}/todo/todonoteaddin.hpp     |   0
 src/plugins/tomboyimport/meson.build               |  27 +
 .../tomboyimport/tomboyimport.desktop.in.in        |  13 +
 .../tomboyimport/tomboyimportaddin.cpp             |   0
 .../tomboyimport/tomboyimportaddin.hpp             |   0
 src/plugins/underline/meson.build                  |  27 +
 src/plugins/underline/underline.desktop.in.in      |  13 +
 .../underline/underlinenoteaddin.cpp               |   0
 .../underline/underlinenoteaddin.hpp               |   0
 src/{addins => plugins}/underline/underlinetag.hpp |   0
 src/plugins/webdavsyncservice/meson.build          |  27 +
 .../webdavsyncservice.desktop.in.in                |  11 +
 .../webdavsyncservice/webdavsyncserviceaddin.cpp   |   0
 .../webdavsyncservice/webdavsyncserviceaddin.hpp   |   0
 src/remotecontrolproxy.cpp                         |   1 +
 src/test/meson.build                               |  40 +
 202 files changed, 1656 insertions(+), 2804 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]