[dia: 105/105] Merge branch 'meson_port' into 'master'
- From: Zander <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia: 105/105] Merge branch 'meson_port' into 'master'
- Date: Mon, 28 Jan 2019 19:28:10 +0000 (UTC)
commit b230c290c68f9f27aa482f3708b10fb1aece0fcc
Merge: af0529be 39240610
Author: Zander <ajhb2001 outlook com>
Date: Mon Jan 28 19:18:59 2019 +0000
Merge branch 'meson_port' into 'master'
Meson port
Closes neduard/dia#2 and #6
See merge request GNOME/dia!14
app/Makefile.am | 25 +-
app/app_procs.c | 2 +-
app/commands.c | 3 -
app/cursor.c | 10 +-
app/menus.c | 14 +-
app/meson.build | 99 +++
app/pixmaps/meson.build | 52 ++
build-aux/post-install.py | 16 +
build-aux/windows-bundler.sh | 27 +
configure.ac | 4 +-
data/Makefile.am | 19 +-
data/icons/meson.build | 18 +
data/meson.build | 5 +
data/ui/Makefile.am | 15 +
data/{ => ui}/display-ui.xml | 0
data/{ => ui}/integrated-ui.xml | 0
data/ui/meson.build | 13 +
data/{ => ui}/popup-ui.xml | 0
data/{ => ui}/sheets-edit-dialog.xml | 0
data/{ => ui}/sheets-main-dialog.xml | 0
data/{ => ui}/sheets-new-dialog.xml | 0
data/{ => ui}/sheets-remove-dialog.xml | 0
data/{ => ui}/toolbar-ui.xml | 0
data/{ => ui}/toolbox-ui.xml | 0
doc/Makefile.am | 32 -
doc/de/dia.xml | 4 +-
doc/de/graphics/misc-shapes.png | Bin 0 -> 2558 bytes
doc/de/meson.build | 90 +++
doc/en/Makefile-html | 14 +
doc/en/dia-dbk-to-chapter.sed | 0
doc/en/dia.1 | 235 -------
doc/en/dia.xml | 7 -
doc/en/meson.build | 123 ++++
doc/eu/meson.build | 82 +++
doc/fr/meson.build | 93 +++
doc/meson.build | 18 +
doc/pl/meson.build | 77 +++
generate_run_with_dia_env.sh | 29 +
hardcopies.make | 2 -
lib/Makefile.am | 13 +-
lib/dia_dirs.c | 34 +-
lib/dia_dirs.h | 8 +-
lib/intl.h | 1 +
lib/libdia.def | 2 +-
lib/meson.build | 130 ++++
lib/object.c | 8 +-
lib/pixmaps/meson.build | 17 +
lib/plug-ins.c | 53 +-
lib/properties.c | 3 -
lib/standard-path.c | 2 +-
meson.build | 109 ++++
objects/AADL/meson.build | 23 +
objects/Database/meson.build | 11 +
objects/ER/meson.build | 12 +
objects/FS/meson.build | 11 +
objects/GRAFCET/meson.build | 16 +
objects/Istar/meson.build | 12 +
objects/Jackson/meson.build | 11 +
objects/KAOS/meson.build | 12 +
objects/Misc/meson.build | 14 +
objects/SADT/meson.build | 11 +
objects/Sozi/meson.build | 14 +
objects/UML/meson.build | 42 ++
objects/chronogram/meson.build | 11 +
objects/custom/Makefile.am | 5 +-
objects/custom/meson.build | 12 +
objects/custom_lines/meson.build | 10 +
objects/flowchart/meson.build | 12 +
objects/meson.build | 31 +
objects/network/meson.build | 12 +
objects/standard/meson.build | 22 +
objects/standard/pixmaps/meson.build | 30 +
plug-ins/cairo/meson.build | 12 +
plug-ins/cgm/meson.build | 4 +
plug-ins/drs/meson.build | 12 +
plug-ins/dxf/meson.build | 11 +
plug-ins/hpgl/meson.build | 4 +
plug-ins/layout/meson.build | 24 +
plug-ins/libart/meson.build | 11 +
plug-ins/meson.build | 48 ++
plug-ins/metapost/meson.build | 9 +
plug-ins/pdf/meson.build | 25 +
plug-ins/pdf/pdf.c | 2 +-
plug-ins/pgf/meson.build | 9 +
plug-ins/pixbuf/meson.build | 4 +
plug-ins/postscript/meson.build | 24 +
plug-ins/pstricks/meson.build | 9 +
plug-ins/python/diamodule.c | 10 +-
plug-ins/python/meson.build | 62 ++
plug-ins/python/pydia-color.c | 2 +-
plug-ins/python/pydia-cpoint.c | 2 +-
plug-ins/python/pydia-diagram.c | 2 +-
plug-ins/python/pydia-diagramdata.c | 2 +-
plug-ins/python/pydia-display.c | 2 +-
plug-ins/python/pydia-error.c | 2 +-
plug-ins/python/pydia-export.c | 2 +-
plug-ins/python/pydia-font.c | 2 +-
plug-ins/python/pydia-geometry.c | 10 +-
plug-ins/python/pydia-handle.c | 2 +-
plug-ins/python/pydia-image.c | 2 +-
plug-ins/python/pydia-layer.c | 2 +-
plug-ins/python/pydia-menuitem.c | 2 +-
plug-ins/python/pydia-object.c | 4 +-
plug-ins/python/pydia-object.h | 15 -
plug-ins/python/pydia-paperinfo.c | 2 +-
plug-ins/python/pydia-properties.c | 2 +-
plug-ins/python/pydia-property.c | 2 +-
plug-ins/python/pydia-sheet.c | 2 +-
plug-ins/python/pydia-text.c | 2 +-
plug-ins/shape/meson.build | 9 +
plug-ins/stress/meson.build | 13 +
plug-ins/svg/meson.build | 10 +
plug-ins/vdx/meson.build | 12 +
plug-ins/vdx/vdx-common.c | 2 +-
plug-ins/wmf/meson.build | 23 +
plug-ins/wmf/wmf_gdi.cpp | 2 +-
plug-ins/wpg/meson.build | 9 +
plug-ins/xfig/meson.build | 11 +
plug-ins/xslt/meson.build | 31 +
po/meson.build | 14 +
shapes/Assorted/meson.build | 89 +++
shapes/BPMN/meson.build | 91 +++
shapes/ChemEng/meson.build | 113 ++++
shapes/Circuit/Makefile.am | 2 +-
shapes/Circuit/meson.build | 71 +++
shapes/Cisco/meson.build | 675 +++++++++++++++++++++
shapes/Civil/Makefile.am | 4 +-
shapes/Civil/meson.build | 59 ++
shapes/Contact/meson.build | 39 ++
shapes/Cybernetics/meson.build | 67 ++
shapes/Electric/meson.build | 37 ++
shapes/{flowchart => Flowchart}/Makefile.am | 0
shapes/{flowchart => Flowchart}/collate.png | Bin
shapes/{flowchart => Flowchart}/collate.shape | 0
shapes/{flowchart => Flowchart}/datasource.png | Bin
shapes/{flowchart => Flowchart}/datasource.shape | 0
shapes/{flowchart => Flowchart}/delay.png | Bin
shapes/{flowchart => Flowchart}/delay.shape | 0
shapes/{flowchart => Flowchart}/display.png | Bin
shapes/{flowchart => Flowchart}/display.shape | 0
shapes/{flowchart => Flowchart}/document.png | Bin
shapes/{flowchart => Flowchart}/document.shape | 0
shapes/{flowchart => Flowchart}/extract.png | Bin
shapes/{flowchart => Flowchart}/extract.shape | 0
shapes/{flowchart => Flowchart}/intstorage.png | Bin
shapes/{flowchart => Flowchart}/intstorage.shape | 0
shapes/{flowchart => Flowchart}/magdisk.png | Bin
shapes/{flowchart => Flowchart}/magdisk.shape | 0
shapes/{flowchart => Flowchart}/magdrum.png | Bin
shapes/{flowchart => Flowchart}/magdrum.shape | 0
shapes/{flowchart => Flowchart}/magtape.png | Bin
shapes/{flowchart => Flowchart}/magtape.shape | 0
shapes/{flowchart => Flowchart}/manualinput.png | Bin
shapes/{flowchart => Flowchart}/manualinput.shape | 0
shapes/{flowchart => Flowchart}/manualop.png | Bin
shapes/{flowchart => Flowchart}/manualop.shape | 0
shapes/{flowchart => Flowchart}/merge.png | Bin
shapes/{flowchart => Flowchart}/merge.shape | 0
shapes/Flowchart/meson.build | 57 ++
shapes/{flowchart => Flowchart}/offlinestore.png | Bin
shapes/{flowchart => Flowchart}/offlinestore.shape | 0
shapes/{flowchart => Flowchart}/offpageconn.png | Bin
shapes/{flowchart => Flowchart}/offpageconn.shape | 0
shapes/{flowchart => Flowchart}/or.png | Bin
shapes/{flowchart => Flowchart}/or.shape | 0
shapes/{flowchart => Flowchart}/predefdproc.png | Bin
shapes/{flowchart => Flowchart}/predefdproc.shape | 0
shapes/{flowchart => Flowchart}/preparation.png | Bin
shapes/{flowchart => Flowchart}/preparation.shape | 0
shapes/{flowchart => Flowchart}/punchedcard.png | Bin
shapes/{flowchart => Flowchart}/punchedcard.shape | 0
shapes/{flowchart => Flowchart}/punchedtape.png | Bin
shapes/{flowchart => Flowchart}/punchedtape.shape | 0
shapes/{flowchart => Flowchart}/sort.png | Bin
shapes/{flowchart => Flowchart}/sort.shape | 0
shapes/{flowchart => Flowchart}/sumjunction.png | Bin
shapes/{flowchart => Flowchart}/sumjunction.shape | 0
shapes/{flowchart => Flowchart}/terminal.png | Bin
shapes/{flowchart => Flowchart}/terminal.shape | 0
shapes/{flowchart => Flowchart}/transaction.png | Bin
shapes/{flowchart => Flowchart}/transaction.shape | 0
shapes/{flowchart => Flowchart}/transmittape.png | Bin
shapes/{flowchart => Flowchart}/transmittape.shape | 0
shapes/Gane_and_Sarson/meson.build | 15 +
shapes/Lights/meson.build | 33 +
shapes/Logic/meson.build | 25 +
shapes/MSE/meson.build | 19 +
shapes/Makefile.am | 2 +-
shapes/Map/Isometric/meson.build | 60 ++
shapes/Map/meson.build | 1 +
shapes/Misc/meson.build | 15 +
shapes/Pneumatic/meson.build | 47 ++
shapes/SDL/meson.build | 41 ++
shapes/Shape_Design/Makefile.am | 4 +-
shapes/Shape_Design/meson.build | 11 +
shapes/jigsaw/meson.build | 39 ++
shapes/meson.build | 33 +
shapes/network/meson.build | 73 +++
shapes/sybase/meson.build | 19 +
sheets/checktrans | 12 +-
sheets/checktrans.py | 11 +-
sheets/meson.build | 126 ++++
tests/exports/exports_test.sh | 37 ++
tests/exports/meson.build | 10 +
tests/meson.build | 60 ++
tests/xmllint_test.sh | 15 +
206 files changed, 3852 insertions(+), 481 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
