netstar pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/wallpaper2.git/commit/?id=c629d72309a9961952711c53e87dba9c20ba7bfa
commit c629d72309a9961952711c53e87dba9c20ba7bfa Author: Alastair Poole <[email protected]> Date: Thu Apr 30 13:12:03 2020 +0100 build: Port to Meson --- Makefile.am | 70 --------- autogen.sh | 17 --- build/.ninja_deps | Bin 0 -> 166196 bytes build/.ninja_log | 48 +++++++ build/build.ninja | 136 ++++++++++++++++++ build/compile_commands.json | 14 ++ build/meson-info/intro-benchmarks.json | 1 + build/meson-info/intro-buildoptions.json | 1 + build/meson-info/intro-buildsystem_files.json | 1 + build/meson-info/intro-dependencies.json | 1 + build/meson-info/intro-installed.json | 1 + build/meson-info/intro-projectinfo.json | 1 + build/meson-info/intro-targets.json | 1 + build/meson-info/intro-tests.json | 1 + build/meson-info/meson-info.json | 1 + build/meson-logs/install-log.txt | 4 + build/meson-logs/meson-log.txt | 198 ++++++++++++++++++++++++++ build/meson-private/build.dat | Bin 0 -> 40764 bytes build/meson-private/cmd_line.txt | 4 + build/meson-private/coredata.dat | Bin 0 -> 36513 bytes build/meson-private/install.dat | Bin 0 -> 1072 bytes build/meson-private/meson.lock | 0 build/meson-private/meson_benchmark_setup.dat | 1 + build/meson-private/meson_test_setup.dat | 1 + build/meson-private/sanitycheckc.c | 1 + build/meson-private/sanitycheckc.exe | Bin 0 -> 16464 bytes build/po/ar.gmo | Bin 0 -> 1201 bytes build/po/bg.gmo | Bin 0 -> 1048 bytes build/po/ca.gmo | Bin 0 -> 1243 bytes build/po/cs.gmo | Bin 0 -> 945 bytes build/po/da.gmo | Bin 0 -> 564 bytes build/po/de.gmo | Bin 0 -> 1093 bytes build/po/el.gmo | Bin 0 -> 1348 bytes build/po/eo.gmo | Bin 0 -> 1277 bytes build/po/es.gmo | Bin 0 -> 1161 bytes build/po/fi.gmo | Bin 0 -> 999 bytes build/po/fr.gmo | Bin 0 -> 1095 bytes build/po/fr_CH.gmo | Bin 0 -> 895 bytes build/po/gl.gmo | Bin 0 -> 1231 bytes build/po/he.gmo | Bin 0 -> 710 bytes build/po/hr.gmo | Bin 0 -> 975 bytes build/po/hu.gmo | Bin 0 -> 1111 bytes build/po/it.gmo | Bin 0 -> 987 bytes build/po/ja.gmo | Bin 0 -> 912 bytes build/po/km.gmo | Bin 0 -> 629 bytes build/po/ko.gmo | Bin 0 -> 971 bytes build/po/lt.gmo | Bin 0 -> 1111 bytes build/po/nb.gmo | Bin 0 -> 736 bytes build/po/nl.gmo | Bin 0 -> 990 bytes build/po/pl.gmo | Bin 0 -> 815 bytes build/po/pt.gmo | Bin 0 -> 1162 bytes build/po/pt_BR.gmo | Bin 0 -> 1060 bytes build/po/ro.gmo | Bin 0 -> 619 bytes build/po/ru.gmo | Bin 0 -> 1278 bytes build/po/sk.gmo | Bin 0 -> 930 bytes build/po/sl.gmo | Bin 0 -> 1073 bytes build/po/sr.gmo | Bin 0 -> 1354 bytes build/po/sv.gmo | Bin 0 -> 733 bytes build/po/tr.gmo | Bin 0 -> 1198 bytes build/po/uk.gmo | Bin 0 -> 1123 bytes build/po/zh_CN.gmo | Bin 0 -> 938 bytes build/po/zh_TW.gmo | Bin 0 -> 959 bytes build/src/module.so | Bin 0 -> 218960 bytes configure.ac | 78 ---------- e_modules-wallpaper2.spec.in | 47 ------ meson.build | 66 +++++++++ meson_options.txt | 4 + module.desktop.in | 33 ----- po/Makevars | 42 ------ po/POTFILES.in | 2 - po/meson.build | 9 ++ src/Makefile.am | 21 --- src/e_int_config_wallpaper.c | 8 +- src/e_mod_main.c | 1 - src/e_mod_main.h | 1 - src/meson.build | 11 ++ 76 files changed, 511 insertions(+), 315 deletions(-) diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index ec79818..0000000 --- a/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 - -MAINTAINERCLEANFILES = \ -m4/libtool.m4 \ -m4/wchar_t.m4 \ -m4/uintmax_t.m4 \ -m4/inttypes-pri.m4 \ -m4/xsize.m4 \ -m4/longdouble.m4 \ -m4/nls.m4 \ -m4/lt~obsolete.m4 \ -m4/wint_t.m4 \ -m4/isc-posix.m4 \ -m4/printf-posix.m4 \ -m4/po.m4 \ -m4/signed.m4 \ -m4/lcmessage.m4 \ -m4/intmax.m4 \ -m4/ltoptions.m4 \ -m4/ulonglong.m4 \ -m4/progtest.m4 \ -m4/glibc21.m4 \ -m4/inttypes.m4 \ -m4/codeset.m4 \ -m4/stdint_h.m4 \ -m4/ltsugar.m4 \ -m4/longlong.m4 \ -m4/inttypes_h.m4 \ -m4/lib-ld.m4 \ -m4/lib-link.m4 \ -m4/gettext.m4 \ -m4/size_max.m4 \ -m4/ltversion.m4 \ -m4/lib-prefix.m4 \ -m4/iconv.m4 \ -m4/intdiv0.m4 \ -Makefile.in \ -aclocal.m4 \ -config.guess \ -config.h.in \ -config.sub \ -configure \ -depcomp \ -install-sh \ -ltmain.sh \ -missing \ -module.\ -desktop \ -config.rpath \ -mkinstalldirs - -SUBDIRS = src - -if HAVE_PO - -SUBDIRS += po - -endif - -filesdir = $(module_dir)/$(PACKAGE) -files_DATA = module.desktop - -EXTRA_DIST = module.desktop.in - -clean-local: - rm -rf *.edj module.desktop *~ - -uninstall-local: - rm -rf $(DESTDIR)$(module_dir)/$(PACKAGE) - diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index ae01364..0000000 --- a/autogen.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -rm -rf autom4te.cache -rm -f aclocal.m4 ltmain.sh - -touch README - -echo "Running autopoint..." ; autopoint -f || : -echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1 -echo "Running autoheader..." ; autoheader || exit 1 -echo "Running autoconf..." ; autoconf || exit 1 -echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 -echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 - -if [ -z "$NOCONFIGURE" ]; then - ./configure "$@" -fi diff --git a/build/.ninja_deps b/build/.ninja_deps new file mode 100644 index 0000000..31d7129 Binary files /dev/null and b/build/.ninja_deps differ diff --git a/build/.ninja_log b/build/.ninja_log new file mode 100644 index 0000000..d295c11 --- /dev/null +++ b/build/.ninja_log @@ -0,0 +1,48 @@ +# ninja log v5 +1 261 1588248012444184802 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +2 309 1588248012492184678 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +309 388 1588248012572184472 src/module.so d57adfaed391d71e +2 224 1588248093059978180 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +224 300 1588248093139977975 src/module.so d57adfaed391d71e +0 3 0 meson-clean a7c70eacb11a5051 +2 244 1588248096955968238 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +3 297 1588248097007968105 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +297 377 1588248097087967900 src/module.so d57adfaed391d71e +2 403 0 meson-install 9bd7faa9472bf40f +0 3 0 meson-clean a7c70eacb11a5051 +1 243 1588248255691565828 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +2 295 1588248255743565697 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +295 372 1588248255819565505 src/module.so d57adfaed391d71e +0 3 0 meson-clean a7c70eacb11a5051 +2 246 1588248283223496513 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +2 298 1588248283275496382 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +298 376 1588248283355496181 src/module.so d57adfaed391d71e +2 245 1588248319407405627 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +3 296 1588248319459405496 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +296 375 1588248319535405305 src/module.so d57adfaed391d71e +0 2 0 meson-clean a7c70eacb11a5051 +1 244 1588248323299395863 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +2 296 1588248323355395722 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +296 375 1588248323431395531 src/module.so d57adfaed391d71e +2 250 1588248350611327403 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +2 300 1588248350659327281 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +300 379 1588248350739327082 src/module.so d57adfaed391d71e +2 276 1588248408555182514 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +276 355 1588248408635182315 src/module.so d57adfaed391d71e +3 273 1588248424347143106 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +274 352 1588248424427142908 src/module.so d57adfaed391d71e +0 2 0 meson-clean a7c70eacb11a5051 +2 243 1588248429015131463 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +2 293 1588248429067131333 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +293 371 1588248429143131143 src/module.so d57adfaed391d71e +2 407 0 meson-install 9bd7faa9472bf40f +2 402 0 meson-install 9bd7faa9472bf40f +0 2 0 meson-clean a7c70eacb11a5051 +2 242 1588248506346938948 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +3 291 1588248506394938828 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +291 370 1588248506474938630 src/module.so d57adfaed391d71e +0 3 0 meson-clean a7c70eacb11a5051 +1 243 1588248646218592300 src/25a6634@@module@sha/e_mod_main.c.o a3e551315b750e17 +2 289 1588248646266592182 src/25a6634@@module@sha/e_int_config_wallpaper.c.o a69c97182a3cd140 +290 367 1588248646342591994 src/module.so d57adfaed391d71e +2 401 0 meson-install 9bd7faa9472bf40f diff --git a/build/build.ninja b/build/build.ninja new file mode 100644 index 0000000..060722a --- /dev/null +++ b/build/build.ninja @@ -0,0 +1,136 @@ +# This is the build file for project "wallpaper2`" +# It is autogenerated by the Meson build system. +# Do not edit by hand. + +ninja_required_version = 1.5.1 + +# Rules for compiling. + +rule c_COMPILER + command = cc $ARGS -MD -MQ $out -MF '$DEPFILE' -o $out -c $in + deps = gcc + depfile = $DEPFILE + description = Compiling C object $out + +# Rules for linking. + +rule c_LINKER + command = cc $ARGS -o $out $in $LINK_ARGS + description = Linking target $out + +rule SHSYM + command = /usr/bin/meson --internal symbolextractor /home/alastair/Code/wallpaper2/build $in $IMPLIB $out $CROSS + description = Generating symbol file $out + restat = 1 + +# Other rules + +rule CUSTOM_COMMAND + command = $COMMAND + description = $DESC + restat = 1 + +rule REGENERATE_BUILD + command = /usr/bin/meson --internal regenerate /home/alastair/Code/wallpaper2 /home/alastair/Code/wallpaper2/build --backend ninja + description = Regenerating build files. + generator = 1 + +# Phony build target, always out of date + +build PHONY: phony + +# Build rules for targets + +build e-module-wallpaper2`-pot: phony meson-e-module-wallpaper2`-pot + +build meson-e-module-wallpaper2`-pot: CUSTOM_COMMAND + COMMAND = /usr/bin/meson --internal commandrunner /home/alastair/Code/wallpaper2 /home/alastair/Code/wallpaper2/build po /usr/bin/meson /usr/bin/meson --internal gettext pot '--pkgname=e-module-wallpaper2`' --extra-args=--keyword=N_@@--keyword=D_@@--from-code=UTF-8@@--foreign-user + description = Running$ external$ command$ e-module-wallpaper2`-pot + pool = console + +build e-module-wallpaper2`-gmo: phony meson-e-module-wallpaper2`-gmo + +build meson-e-module-wallpaper2`-gmo: CUSTOM_COMMAND + COMMAND = /usr/bin/meson --internal commandrunner /home/alastair/Code/wallpaper2 /home/alastair/Code/wallpaper2/build po /usr/bin/meson /usr/bin/meson --internal gettext gen_gmo + description = Running$ external$ command$ e-module-wallpaper2`-gmo + pool = console + +build e-module-wallpaper2`-update-po: phony meson-e-module-wallpaper2`-update-po + +build meson-e-module-wallpaper2`-update-po: CUSTOM_COMMAND + COMMAND = /usr/bin/meson --internal commandrunner /home/alastair/Code/wallpaper2 /home/alastair/Code/wallpaper2/build po /usr/bin/meson /usr/bin/meson --internal gettext update_po '--pkgname=e-module-wallpaper2`' --extra-args=--keyword=N_@@--keyword=D_@@--from-code=UTF-8@@--foreign-user + description = Running$ external$ command$ e-module-wallpaper2`-update-po + pool = console + +build src/25a6634@@module@sha/e_mod_main.c.o: c_COMPILER ../src/e_mod_main.c + DEPFILE = src/25a6634@@module@sha/e_mod_main.c.o.d + ARGS = -Isrc/25a6634@@module@sha -Isrc -I../src -I. -I.. -I/usr/local/include/enlightenment -I/usr/local/include/elementary-1 -I/usr/local/include/ethumb-client-1 -I/usr/local/include/ethumb-1 -I/usr/local/include/edje-1 -I/usr/local/include/ecore-evas-1 -I/usr/local/include/ecore-input-evas-1 -I/usr/local/include/ecore-imf-evas-1 -I/usr/local/include/ecore-imf-1 -I/usr/local/include/embryo-1 -I/usr/local/include/ecore-audio-1 -I/usr/local/include/emotion-1 -I/usr/local/include/evas-1 - [...] + +build src/25a6634@@module@sha/e_int_config_wallpaper.c.o: c_COMPILER ../src/e_int_config_wallpaper.c + DEPFILE = src/25a6634@@module@sha/e_int_config_wallpaper.c.o.d + ARGS = -Isrc/25a6634@@module@sha -Isrc -I../src -I. -I.. -I/usr/local/include/enlightenment -I/usr/local/include/elementary-1 -I/usr/local/include/ethumb-client-1 -I/usr/local/include/ethumb-1 -I/usr/local/include/edje-1 -I/usr/local/include/ecore-evas-1 -I/usr/local/include/ecore-input-evas-1 -I/usr/local/include/ecore-imf-evas-1 -I/usr/local/include/ecore-imf-1 -I/usr/local/include/embryo-1 -I/usr/local/include/ecore-audio-1 -I/usr/local/include/emotion-1 -I/usr/local/include/evas-1 - [...] + +build src/25a6634@@module@sha/module.so.symbols: SHSYM src/module.so + IMPLIB = src/module.so + +build src/module.so: c_LINKER src/25a6634@@module@sha/e_mod_main.c.o src/25a6634@@module@sha/e_int_config_wallpaper.c.o | /usr/lib/x86_64-linux-gnu/libm.a /usr/lib/x86_64-linux-gnu/libm.so /usr/local/lib/x86_64-linux-gnu/libecore_ipc.so /usr/local/lib/x86_64-linux-gnu/libecore_input_evas.so /usr/local/lib/x86_64-linux-gnu/libeeze.so /usr/local/lib/x86_64-linux-gnu/libelementary.so /usr/local/lib/x86_64-linux-gnu/libecore_evas.so /usr/local/lib/x86_64-linux-gnu/libecore_file.so /usr/local [...] + LINK_ARGS = -Wl,--as-needed -Wl,--allow-shlib-undefined -shared -fPIC -Wl,--start-group -Wl,-soname,module.so /usr/local/lib/x86_64-linux-gnu/libecore_ipc.so /usr/local/lib/x86_64-linux-gnu/libecore_input_evas.so /usr/local/lib/x86_64-linux-gnu/libeeze.so /usr/local/lib/x86_64-linux-gnu/libelementary.so /usr/local/lib/x86_64-linux-gnu/libecore_evas.so /usr/local/lib/x86_64-linux-gnu/libecore_file.so /usr/local/lib/x86_64-linux-gnu/libecore_input.so /usr/local/lib/x86_64-linux-gnu/libeco [...] + +# Test rules + +build meson-test: CUSTOM_COMMAND all PHONY + COMMAND = /usr/bin/meson test --no-rebuild --print-errorlogs + DESC = Running$ all$ tests. + pool = console + +build test: phony meson-test + +build meson-benchmark: CUSTOM_COMMAND all PHONY + COMMAND = /usr/bin/meson test --benchmark --logbase benchmarklog --num-processes=1 --no-rebuild + DESC = Running$ benchmark$ suite. + pool = console + +build benchmark: phony meson-benchmark + +# Install rules + +build meson-install: CUSTOM_COMMAND PHONY | all + DESC = Installing$ files. + COMMAND = /usr/bin/meson install --no-rebuild + pool = console + +build install: phony meson-install + +build meson-dist: CUSTOM_COMMAND PHONY + DESC = Creating$ source$ packages + COMMAND = /usr/bin/meson dist + pool = console + +build dist: phony meson-dist + +# Suffix + +build meson-uninstall: CUSTOM_COMMAND PHONY + COMMAND = /usr/bin/meson --internal uninstall + pool = console + +build uninstall: phony meson-uninstall + +build all: phony src/module.so + +build clean: phony meson-clean + +build meson-clean: CUSTOM_COMMAND PHONY + COMMAND = /usr/bin/ninja -t clean + description = Cleaning + +build build.ninja: REGENERATE_BUILD ../meson.build ../meson_options.txt ../po/meson.build ../src/meson.build meson-private/coredata.dat + pool = console + +build reconfigure: REGENERATE_BUILD PHONY + pool = console + +build ../meson.build ../meson_options.txt ../po/meson.build ../src/meson.build meson-private/coredata.dat: phony + +default all + diff --git a/build/compile_commands.json b/build/compile_commands.json new file mode 100644 index 0000000..28e062d --- /dev/null +++ b/build/compile_commands.json @@ -0,0 +1,14 @@ +[ + { + "directory": "/home/alastair/Code/wallpaper2/build", + "command": "cc -Isrc/25a6634@@module@sha -Isrc -I../src -I. -I.. -I/usr/local/include/enlightenment -I/usr/local/include/elementary-1 -I/usr/local/include/ethumb-client-1 -I/usr/local/include/ethumb-1 -I/usr/local/include/edje-1 -I/usr/local/include/ecore-evas-1 -I/usr/local/include/ecore-input-evas-1 -I/usr/local/include/ecore-imf-evas-1 -I/usr/local/include/ecore-imf-1 -I/usr/local/include/embryo-1 -I/usr/local/include/ecore-audio-1 -I/usr/local/include/emotion-1 -I/usr/local/inclu [...] + "file": "../src/e_mod_main.c", + "output": "src/25a6634@@module@sha/e_mod_main.c.o" + }, + { + "directory": "/home/alastair/Code/wallpaper2/build", + "command": "cc -Isrc/25a6634@@module@sha -Isrc -I../src -I. -I.. -I/usr/local/include/enlightenment -I/usr/local/include/elementary-1 -I/usr/local/include/ethumb-client-1 -I/usr/local/include/ethumb-1 -I/usr/local/include/edje-1 -I/usr/local/include/ecore-evas-1 -I/usr/local/include/ecore-input-evas-1 -I/usr/local/include/ecore-imf-evas-1 -I/usr/local/include/ecore-imf-1 -I/usr/local/include/embryo-1 -I/usr/local/include/ecore-audio-1 -I/usr/local/include/emotion-1 -I/usr/local/inclu [...] + "file": "../src/e_int_config_wallpaper.c", + "output": "src/25a6634@@module@sha/e_int_config_wallpaper.c.o" + } +] diff --git a/build/meson-info/intro-benchmarks.json b/build/meson-info/intro-benchmarks.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/build/meson-info/intro-benchmarks.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/build/meson-info/intro-buildoptions.json b/build/meson-info/intro-buildoptions.json new file mode 100644 index 0000000..6a22369 --- /dev/null +++ b/build/meson-info/intro-buildoptions.json @@ -0,0 +1 @@ +[{"name": "auto_features", "value": "auto", "section": "core", "machine": "any", "choices": ["enabled", "disabled", "auto"], "type": "combo", "description": "Override value of all 'auto' features"}, {"name": "backend", "value": "ninja", "section": "core", "machine": "any", "choices": ["ninja", "vs", "vs2010", "vs2015", "vs2017", "vs2019", "xcode"], "type": "combo", "description": "Backend to use"}, {"name": "buildtype", "value": "debug", "section": "core", "machine": "any", "choices": [" [...] \ No newline at end of file diff --git a/build/meson-info/intro-buildsystem_files.json b/build/meson-info/intro-buildsystem_files.json new file mode 100644 index 0000000..eaf812f --- /dev/null +++ b/build/meson-info/intro-buildsystem_files.json @@ -0,0 +1 @@ +["/home/alastair/Code/wallpaper2/meson.build", "/home/alastair/Code/wallpaper2/meson_options.txt", "/home/alastair/Code/wallpaper2/po/meson.build", "/home/alastair/Code/wallpaper2/src/meson.build"] \ No newline at end of file diff --git a/build/meson-info/intro-dependencies.json b/build/meson-info/intro-dependencies.json new file mode 100644 index 0000000..4e20002 --- /dev/null +++ b/build/meson-info/intro-dependencies.json @@ -0,0 +1 @@ +[{"name": "enlightenment", "version": "0.23.99.157", "compile_args": ["-D_REENTRANT", "-pthread", "-I/usr/local/include/enlightenment", "-I/usr/local/include/elementary-1", "-I/usr/local/include/efreet-1", "-I/usr/local/include/ethumb-client-1", "-I/usr/local/include/ethumb-1", "-I/usr/local/include/edje-1", "-I/usr/local/include/ecore-evas-1", "-I/usr/local/include/ecore-input-evas-1", "-I/usr/local/include/ecore-imf-evas-1", "-I/usr/local/include/ecore-imf-1", "-I/usr/local/include/emb [...] \ No newline at end of file diff --git a/build/meson-info/intro-installed.json b/build/meson-info/intro-installed.json new file mode 100644 index 0000000..e998107 --- /dev/null +++ b/build/meson-info/intro-installed.json @@ -0,0 +1 @@ +{"/home/alastair/Code/wallpaper2/build/src/module.so": "/usr/local/lib/x86_64-linux-gnu/enlightenment/modules/wallpaper2`/linux-gnu-x86_64-dev-0.23.99/module.so", "/home/alastair/Code/wallpaper2/module.desktop": "/usr/local/lib/x86_64-linux-gnu/enlightenment/modules/wallpaper2`/module.desktop"} \ No newline at end of file diff --git a/build/meson-info/intro-projectinfo.json b/build/meson-info/intro-projectinfo.json new file mode 100644 index 0000000..3edbcc9 --- /dev/null +++ b/build/meson-info/intro-projectinfo.json @@ -0,0 +1 @@ +{"version": "undefined", "descriptive_name": "wallpaper2`", "subproject_dir": "subprojects", "subprojects": []} \ No newline at end of file diff --git a/build/meson-info/intro-targets.json b/build/meson-info/intro-targets.json new file mode 100644 index 0000000..d7e8ad4 --- /dev/null +++ b/build/meson-info/intro-targets.json @@ -0,0 +1 @@ +[{"name": "e-module-wallpaper2`-pot", "id": "6199aec@@e-module-wallpaper2`-pot@run", "type": "run", "defined_in": "/home/alastair/Code/wallpaper2/po/meson.build", "filename": ["/home/alastair/Code/wallpaper2/build/po/e-module-wallpaper2`-pot"], "build_by_default": false, "target_sources": [], "subproject": null, "installed": false}, {"name": "e-module-wallpaper2`-gmo", "id": "6199aec@@e-module-wallpaper2`-gmo@run", "type": "run", "defined_in": "/home/alastair/Code/wallpaper2/po/meson.bui [...] \ No newline at end of file diff --git a/build/meson-info/intro-tests.json b/build/meson-info/intro-tests.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/build/meson-info/intro-tests.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/build/meson-info/meson-info.json b/build/meson-info/meson-info.json new file mode 100644 index 0000000..5767fdc --- /dev/null +++ b/build/meson-info/meson-info.json @@ -0,0 +1 @@ +{"meson_version": {"full": "0.54.1", "major": 0, "minor": 54, "patch": 1}, "directories": {"source": "/home/alastair/Code/wallpaper2", "build": "/home/alastair/Code/wallpaper2/build", "info": "/home/alastair/Code/wallpaper2/build/meson-info"}, "introspection": {"version": {"full": "1.0.0", "major": 1, "minor": 0, "patch": 0}, "information": {"benchmarks": {"file": "intro-benchmarks.json", "updated": true}, "buildoptions": {"file": "intro-buildoptions.json", "updated": true}, "buildsystem [...] \ No newline at end of file diff --git a/build/meson-logs/install-log.txt b/build/meson-logs/install-log.txt new file mode 100644 index 0000000..b3d8003 --- /dev/null +++ b/build/meson-logs/install-log.txt @@ -0,0 +1,4 @@ +# List of files installed by Meson +# Does not contain files installed by custom scripts. +/usr/local/lib/x86_64-linux-gnu/enlightenment/modules/wallpaper2`/linux-gnu-x86_64-dev-0.23.99/module.so +/usr/local/lib/x86_64-linux-gnu/enlightenment/modules/wallpaper2`/module.desktop diff --git a/build/meson-logs/meson-log.txt b/build/meson-logs/meson-log.txt new file mode 100644 index 0000000..8c64b9a --- /dev/null +++ b/build/meson-logs/meson-log.txt @@ -0,0 +1,198 @@ +Build started at 2020-04-30T13:00:09.649192 +Main binary: /usr/bin/python3 +Build Options: +Python system: Linux +The Meson build system +Version: 0.54.1 +Source dir: /home/alastair/Code/wallpaper2 +Build dir: /home/alastair/Code/wallpaper2/build +Build type: native build +None of 'PKG_CONFIG_PATH' are defined in the environment, not changing global flags. +None of 'PKG_CONFIG_PATH' are defined in the environment, not changing global flags. +Project name: wallpaper2` +Project version: undefined +None of 'CC' are defined in the environment, not changing global flags. +None of 'CFLAGS' are defined in the environment, not changing global flags. +None of 'LDFLAGS' are defined in the environment, not changing global flags. +None of 'CPPFLAGS' are defined in the environment, not changing global flags. +None of 'CC_LD' are defined in the environment, not changing global flags. +Sanity testing C compiler: cc +Is cross compiler: False. +Sanity check compiler command line: cc /home/alastair/Code/wallpaper2/build/meson-private/sanitycheckc.c -o /home/alastair/Code/wallpaper2/build/meson-private/sanitycheckc.exe -pipe -D_FILE_OFFSET_BITS=64 +Sanity check compile stdout: + +----- +Sanity check compile stderr: + +----- +Running test binary command: /home/alastair/Code/wallpaper2/build/meson-private/sanitycheckc.exe +C compiler for the build machine: cc (gcc 9.3.0 "cc (Debian 9.3.0-11) 9.3.0") +C linker for the build machine: cc ld.bfd 2.34 +None of 'AR' are defined in the environment, not changing global flags. +None of 'CC' are defined in the environment, not changing global flags. +None of 'CFLAGS' are defined in the environment, not changing global flags. +None of 'LDFLAGS' are defined in the environment, not changing global flags. +None of 'CPPFLAGS' are defined in the environment, not changing global flags. +None of 'CC_LD' are defined in the environment, not changing global flags. +Sanity testing C compiler: cc +Is cross compiler: False. +Sanity check compiler command line: cc /home/alastair/Code/wallpaper2/build/meson-private/sanitycheckc.c -o /home/alastair/Code/wallpaper2/build/meson-private/sanitycheckc.exe -pipe -D_FILE_OFFSET_BITS=64 +Sanity check compile stdout: + +----- +Sanity check compile stderr: + +----- +Running test binary command: /home/alastair/Code/wallpaper2/build/meson-private/sanitycheckc.exe +C compiler for the host machine: cc (gcc 9.3.0 "cc (Debian 9.3.0-11) 9.3.0") +C linker for the host machine: cc ld.bfd 2.34 +None of 'AR' are defined in the environment, not changing global flags. +Build machine cpu family: x86_64 +Build machine cpu: x86_64 +Host machine cpu family: x86_64 +Host machine cpu: x86_64 +Target machine cpu family: x86_64 +Target machine cpu: x86_64 +Pkg-config binary for MachineChoice.HOST is not cached. +None of 'PKG_CONFIG' are defined in the environment, not changing global flags. +Pkg-config binary missing from cross or native file, or env var undefined. +Trying a default Pkg-config fallback at pkg-config +Trying pkg-config binary pkg-config for machine MachineChoice.HOST at ['/usr/bin/pkg-config'] +Found pkg-config: /usr/bin/pkg-config (0.29.2) +Determining dependency 'enlightenment' with pkg-config executable '/usr/bin/pkg-config' +PKG_CONFIG_PATH: +Called `/usr/bin/pkg-config --modversion enlightenment` -> 0 +0.23.99.157 +PKG_CONFIG_PATH: +Called `/usr/bin/pkg-config --cflags enlightenment` -> 0 +-D_REENTRANT -pthread -I/usr/local/include/enlightenment -I/usr/local/include/elementary-1 -I/usr/local/include/efreet-1 -I/usr/local/include/ethumb-client-1 -I/usr/local/include/ethumb-1 -I/usr/local/include/edje-1 -I/usr/local/include/ecore-evas-1 -I/usr/local/include/ecore-input-evas-1 -I/usr/local/include/ecore-imf-evas-1 -I/usr/local/include/ecore-imf-1 -I/usr/local/include/embryo-1 -I/usr/local/include/efreet-1 -I/usr/local/include/ecore-audio-1 -I/usr/local/include/emotion-1 -I/us [...] +PKG_CONFIG_PATH: +Called `/usr/bin/pkg-config enlightenment --libs` -> 0 +-L/usr/local/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu -lecore_ipc -lecore_input_evas -leeze -lelementary -lecore_evas -lecore_file -lecore_input -lecore_imf -lecore_con -ledje -lm -levas -lecore -lector -lluajit-5.1 -leldbus -lefreet -lefreet_mime -lefreet_trash -lethumb_client -lethumb -lemotion -leio -leet -lemile -lecore_x -lefl -leo -leina -pthread +PKG_CONFIG_PATH: +Called `/usr/bin/pkg-config enlightenment --libs` -> 0 +-L/usr/local/lib/x86_64-linux-gnu -lecore_ipc -lecore_input_evas -leeze -lelementary -lecore_evas -lecore_file -lecore_input -lecore_imf -lecore_con -ledje -lm -levas -lecore -lector -lluajit-5.1 -leldbus -lefreet -lefreet_mime -lefreet_trash -lethumb_client -lethumb -lemotion -leio -leet -lemile -lecore_x -lefl -leo -leina -pthread +None of 'PKG_CONFIG_PATH' are defined in the environment, not changing global flags. +Running compile: +Working directory: /home/alastair/Code/wallpaper2/build/meson-private/tmp3x3mo9qv +Command line: cc /home/alastair/Code/wallpaper2/build/meson-private/tmp3x3mo9qv/testfile.c -o /home/alastair/Code/wallpaper2/build/meson-private/tmp3x3mo9qv/output.exe -pipe -D_FILE_OFFSET_BITS=64 -O0 + +Code: + #include<stdio.h> + + int main(void) { + printf("%ld\n", (long)(sizeof(void *))); + return 0; + }; +Compiler stdout: + +Compiler stderr: + +Program stdout: + +8 + +Program stderr: + + +Running compile: +Working directory: /home/alastair/Code/wallpaper2/build/meson-private/tmp5wnvnw59 +Command line: cc /home/alastair/Code/wallpaper2/build/meson-private/tmp5wnvnw59/testfile.c -o /home/alastair/Code/wallpaper2/build/meson-private/tmp5wnvnw59/output.obj -pipe -c -D_FILE_OFFSET_BITS=64 -O0 --print-search-dirs + +Code: + +Compiler stdout: + install: /usr/lib/gcc/x86_64-linux-gnu/9/ +programs: =/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/9/../../../../x86_64-linux-gnu/bin/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/9/../../../../x86_64-linux-gnu/bin/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/9/../../../../x86_64-linux-gnu/bin/ +libraries: =/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/9/../../../../x86_64-linux-gnu/lib/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/9/../../../../x86_64-linux-gnu/lib/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/9/../../../../x86_64-linux-gnu/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/9/../../../x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/9/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/9/../../../../lib/:/lib/x86_64-linux-gnu/9/:/lib/x86_64- [...] + +Compiler stderr: + +Running compile: +Working directory: /home/alastair/Code/wallpaper2/build/meson-private/tmp5cr82p5g +Command line: cc /home/alastair/Code/wallpaper2/build/meson-private/tmp5cr82p5g/testfile.c -o /home/alastair/Code/wallpaper2/build/meson-private/tmp5cr82p5g/output.exe -pipe -D_FILE_OFFSET_BITS=64 -O0 -Wl,--start-group -lm -Wl,--end-group -Wl,--allow-shlib-undefined + +Code: + int main(void) { return 0; } +Compiler stdout: + +Compiler stderr: + +Run-time dependency enlightenment found: YES 0.23.99.157 +PKG_CONFIG_PATH: +Called `/usr/bin/pkg-config --variable=modules enlightenment` -> 0 +/usr/local/lib/x86_64-linux-gnu/enlightenment/modules +Got pkgconfig variable modules : /usr/local/lib/x86_64-linux-gnu/enlightenment/modules +PKG_CONFIG_PATH: +Called `/usr/bin/pkg-config --variable=release enlightenment` -> 0 +dev-0.23.99 +Got pkgconfig variable release : dev-0.23.99 +Running compile: +Working directory: /home/alastair/Code/wallpaper2/build/meson-private/tmpsn7ohbqf +Command line: cc /home/alastair/Code/wallpaper2/build/meson-private/tmpsn7ohbqf/testfile.c -o /home/alastair/Code/wallpaper2/build/meson-private/tmpsn7ohbqf/output.obj -pipe -c -D_FILE_OFFSET_BITS=64 -O0 + +Code: + + #include <features.h> + int main(void) { + /* If it's not defined as a macro, try to use as a symbol */ + #ifndef __UCLIBC__ + __UCLIBC__; + #endif + return 0; + } +Compiler stdout: + +Compiler stderr: + /home/alastair/Code/wallpaper2/build/meson-private/tmpsn7ohbqf/testfile.c: In function 'main': +/home/alastair/Code/wallpaper2/build/meson-private/tmpsn7ohbqf/testfile.c:6:17: error: '__UCLIBC__' undeclared (first use in this function); did you mean '__LINE__'? + 6 | __UCLIBC__; + | ^~~~~~~~~~ + | __LINE__ +/home/alastair/Code/wallpaper2/build/meson-private/tmpsn7ohbqf/testfile.c:6:17: note: each undeclared identifier is reported only once for each function it appears in + +Header <features.h> has symbol "__UCLIBC__" : NO +Running compile: +Working directory: /home/alastair/Code/wallpaper2/build/meson-private/tmp7iy42va0 +Command line: cc /home/alastair/Code/wallpaper2/build/meson-private/tmp7iy42va0/testfile.c -o /home/alastair/Code/wallpaper2/build/meson-private/tmp7iy42va0/output.obj -pipe -c -D_FILE_OFFSET_BITS=64 -O0 + +Code: + + #include <features.h> + int main(void) { + /* If it's not defined as a macro, try to use as a symbol */ + #ifndef __dietlibc__ + __dietlibc__; + #endif + return 0; + } +Compiler stdout: + +Compiler stderr: + /home/alastair/Code/wallpaper2/build/meson-private/tmp7iy42va0/testfile.c: In function 'main': +/home/alastair/Code/wallpaper2/build/meson-private/tmp7iy42va0/testfile.c:6:17: error: '__dietlibc__' undeclared (first use in this function) + 6 | __dietlibc__; + | ^~~~~~~~~~~~ +/home/alastair/Code/wallpaper2/build/meson-private/tmp7iy42va0/testfile.c:6:17: note: each undeclared identifier is reported only once for each function it appears in + +Header <features.h> has symbol "__dietlibc__" : NO +Running compile: +Working directory: /home/alastair/Code/wallpaper2/build/meson-private/tmpo7b4ol98 +Command line: cc /home/alastair/Code/wallpaper2/build/meson-private/tmpo7b4ol98/testfile.c -o /home/alastair/Code/wallpaper2/build/meson-private/tmpo7b4ol98/output.exe -pipe -D_FILE_OFFSET_BITS=64 -O0 -Wl,--start-group -lintl -Wl,--end-group -Wl,--allow-shlib-undefined + +Code: + int main(void) { return 0; } +Compiler stdout: + +Compiler stderr: + /usr/bin/ld: cannot find -lintl +collect2: error: ld returned 1 exit status + +Library intl found: NO +Program edje_cc found: YES (/usr/local/bin/edje_cc) +Configuring config.h using configuration +Build targets in project: 4 + +Found ninja-1.10.0 at /usr/bin/ninja +None of 'STRIP' are defined in the environment, not changing global flags. +None of 'STRIP' are defined in the environment, not changing global flags. diff --git a/build/meson-private/build.dat b/build/meson-private/build.dat new file mode 100644 index 0000000..4ea13cf Binary files /dev/null and b/build/meson-private/build.dat differ diff --git a/build/meson-private/cmd_line.txt b/build/meson-private/cmd_line.txt new file mode 100644 index 0000000..6e871cd --- /dev/null +++ b/build/meson-private/cmd_line.txt @@ -0,0 +1,4 @@ +[options] + +[properties] + diff --git a/build/meson-private/coredata.dat b/build/meson-private/coredata.dat new file mode 100644 index 0000000..9685418 Binary files /dev/null and b/build/meson-private/coredata.dat differ diff --git a/build/meson-private/install.dat b/build/meson-private/install.dat new file mode 100644 index 0000000..d39abc6 Binary files /dev/null and b/build/meson-private/install.dat differ diff --git a/build/meson-private/meson.lock b/build/meson-private/meson.lock new file mode 100644 index 0000000..e69de29 diff --git a/build/meson-private/meson_benchmark_setup.dat b/build/meson-private/meson_benchmark_setup.dat new file mode 100644 index 0000000..92c3c88 --- /dev/null +++ b/build/meson-private/meson_benchmark_setup.dat @@ -0,0 +1 @@ +�]�. \ No newline at end of file diff --git a/build/meson-private/meson_test_setup.dat b/build/meson-private/meson_test_setup.dat new file mode 100644 index 0000000..92c3c88 --- /dev/null +++ b/build/meson-private/meson_test_setup.dat @@ -0,0 +1 @@ +�]�. \ No newline at end of file diff --git a/build/meson-private/sanitycheckc.c b/build/meson-private/sanitycheckc.c new file mode 100644 index 0000000..a27020e --- /dev/null +++ b/build/meson-private/sanitycheckc.c @@ -0,0 +1 @@ +int main(void) { int class=0; return class; } diff --git a/build/meson-private/sanitycheckc.exe b/build/meson-private/sanitycheckc.exe new file mode 100755 index 0000000..74613fd Binary files /dev/null and b/build/meson-private/sanitycheckc.exe differ diff --git a/build/po/ar.gmo b/build/po/ar.gmo new file mode 100644 index 0000000..d41875a Binary files /dev/null and b/build/po/ar.gmo differ diff --git a/build/po/bg.gmo b/build/po/bg.gmo new file mode 100644 index 0000000..be65043 Binary files /dev/null and b/build/po/bg.gmo differ diff --git a/build/po/ca.gmo b/build/po/ca.gmo new file mode 100644 index 0000000..1cb992e Binary files /dev/null and b/build/po/ca.gmo differ diff --git a/build/po/cs.gmo b/build/po/cs.gmo new file mode 100644 index 0000000..74fcb4f Binary files /dev/null and b/build/po/cs.gmo differ diff --git a/build/po/da.gmo b/build/po/da.gmo new file mode 100644 index 0000000..d5708b2 Binary files /dev/null and b/build/po/da.gmo differ diff --git a/build/po/de.gmo b/build/po/de.gmo new file mode 100644 index 0000000..f1e2cd3 Binary files /dev/null and b/build/po/de.gmo differ diff --git a/build/po/el.gmo b/build/po/el.gmo new file mode 100644 index 0000000..446221c Binary files /dev/null and b/build/po/el.gmo differ diff --git a/build/po/eo.gmo b/build/po/eo.gmo new file mode 100644 index 0000000..9f5f97f Binary files /dev/null and b/build/po/eo.gmo differ diff --git a/build/po/es.gmo b/build/po/es.gmo new file mode 100644 index 0000000..b112b37 Binary files /dev/null and b/build/po/es.gmo differ diff --git a/build/po/fi.gmo b/build/po/fi.gmo new file mode 100644 index 0000000..d036fb7 Binary files /dev/null and b/build/po/fi.gmo differ diff --git a/build/po/fr.gmo b/build/po/fr.gmo new file mode 100644 index 0000000..bd5675e Binary files /dev/null and b/build/po/fr.gmo differ diff --git a/build/po/fr_CH.gmo b/build/po/fr_CH.gmo new file mode 100644 index 0000000..2e2efc2 Binary files /dev/null and b/build/po/fr_CH.gmo differ diff --git a/build/po/gl.gmo b/build/po/gl.gmo new file mode 100644 index 0000000..7059b6f Binary files /dev/null and b/build/po/gl.gmo differ diff --git a/build/po/he.gmo b/build/po/he.gmo new file mode 100644 index 0000000..a27ea56 Binary files /dev/null and b/build/po/he.gmo differ diff --git a/build/po/hr.gmo b/build/po/hr.gmo new file mode 100644 index 0000000..66b9dcb Binary files /dev/null and b/build/po/hr.gmo differ diff --git a/build/po/hu.gmo b/build/po/hu.gmo new file mode 100644 index 0000000..a610f5d Binary files /dev/null and b/build/po/hu.gmo differ diff --git a/build/po/it.gmo b/build/po/it.gmo new file mode 100644 index 0000000..ad415e4 Binary files /dev/null and b/build/po/it.gmo differ diff --git a/build/po/ja.gmo b/build/po/ja.gmo new file mode 100644 index 0000000..e85dbdf Binary files /dev/null and b/build/po/ja.gmo differ diff --git a/build/po/km.gmo b/build/po/km.gmo new file mode 100644 index 0000000..59c8584 Binary files /dev/null and b/build/po/km.gmo differ diff --git a/build/po/ko.gmo b/build/po/ko.gmo new file mode 100644 index 0000000..321b68d Binary files /dev/null and b/build/po/ko.gmo differ diff --git a/build/po/lt.gmo b/build/po/lt.gmo new file mode 100644 index 0000000..c43e809 Binary files /dev/null and b/build/po/lt.gmo differ diff --git a/build/po/nb.gmo b/build/po/nb.gmo new file mode 100644 index 0000000..ef7a785 Binary files /dev/null and b/build/po/nb.gmo differ diff --git a/build/po/nl.gmo b/build/po/nl.gmo new file mode 100644 index 0000000..cd83f62 Binary files /dev/null and b/build/po/nl.gmo differ diff --git a/build/po/pl.gmo b/build/po/pl.gmo new file mode 100644 index 0000000..bbe7192 Binary files /dev/null and b/build/po/pl.gmo differ diff --git a/build/po/pt.gmo b/build/po/pt.gmo new file mode 100644 index 0000000..a06297e Binary files /dev/null and b/build/po/pt.gmo differ diff --git a/build/po/pt_BR.gmo b/build/po/pt_BR.gmo new file mode 100644 index 0000000..a598dc6 Binary files /dev/null and b/build/po/pt_BR.gmo differ diff --git a/build/po/ro.gmo b/build/po/ro.gmo new file mode 100644 index 0000000..55e199d Binary files /dev/null and b/build/po/ro.gmo differ diff --git a/build/po/ru.gmo b/build/po/ru.gmo new file mode 100644 index 0000000..e1076b4 Binary files /dev/null and b/build/po/ru.gmo differ diff --git a/build/po/sk.gmo b/build/po/sk.gmo new file mode 100644 index 0000000..e625bbe Binary files /dev/null and b/build/po/sk.gmo differ diff --git a/build/po/sl.gmo b/build/po/sl.gmo new file mode 100644 index 0000000..7dab422 Binary files /dev/null and b/build/po/sl.gmo differ diff --git a/build/po/sr.gmo b/build/po/sr.gmo new file mode 100644 index 0000000..d5f2c9f Binary files /dev/null and b/build/po/sr.gmo differ diff --git a/build/po/sv.gmo b/build/po/sv.gmo new file mode 100644 index 0000000..35beac6 Binary files /dev/null and b/build/po/sv.gmo differ diff --git a/build/po/tr.gmo b/build/po/tr.gmo new file mode 100644 index 0000000..da775d1 Binary files /dev/null and b/build/po/tr.gmo differ diff --git a/build/po/uk.gmo b/build/po/uk.gmo new file mode 100644 index 0000000..503f8cd Binary files /dev/null and b/build/po/uk.gmo differ diff --git a/build/po/zh_CN.gmo b/build/po/zh_CN.gmo new file mode 100644 index 0000000..5b290bb Binary files /dev/null and b/build/po/zh_CN.gmo differ diff --git a/build/po/zh_TW.gmo b/build/po/zh_TW.gmo new file mode 100644 index 0000000..f7a0560 Binary files /dev/null and b/build/po/zh_TW.gmo differ diff --git a/build/src/module.so b/build/src/module.so new file mode 100755 index 0000000..5a658b0 Binary files /dev/null and b/build/src/module.so differ diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 8b8f979..0000000 --- a/configure.ac +++ /dev/null @@ -1,78 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -# get rid of that stupid cache mechanism -rm -f config.cache - -AC_INIT(wallpaper2, 0.1, [email protected]) -AC_CONFIG_MACRO_DIR([m4]) -AC_PREREQ(2.52) -AC_CONFIG_SRCDIR(configure.ac) -AC_CANONICAL_BUILD -AC_CANONICAL_HOST -AC_ISC_POSIX - -AM_INIT_AUTOMAKE([1.8 dist-bzip2]) -AM_CONFIG_HEADER(config.h) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_USE_SYSTEM_EXTENSIONS - -AC_PROG_CC -AM_PROG_CC_STDC - -define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl -define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl -AC_PROG_LIBTOOL - -m4_ifdef([AM_GNU_GETTEXT_VERSION], [ -AM_GNU_GETTEXT_VERSION([0.14]) -]) - -m4_ifdef([AM_GNU_GETTEXT], [ -AM_GNU_GETTEXT([external]) -po_makefile_in=po/Makefile.in -AM_CONDITIONAL([HAVE_PO], [true]) -],[ -AM_CONDITIONAL([HAVE_PO], [false]) -]) -AC_SUBST(LTLIBINTL) - -PKG_CHECK_MODULES([E], [enlightenment > 0.18.99]) -release=$(pkg-config --variable=release enlightenment) -MODULE_ARCH="$host_os-$host_cpu-$release" -AC_SUBST(MODULE_ARCH) -AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") - -module_dir="$(pkg-config --variable=modules enlightenment)" -AC_SUBST(module_dir) -datadir="$module_dir/wallpaper2" -# Find edje_cc -##AC_ARG_WITH(edje-cc, -## AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]), -## [ -## v=$withval; -## EDJE_CC=$v -## ],[ -## EDJE_CC=$(pkg-config --variable=prefix edje)/bin/edje_cc -## ] -##) -##AC_SUBST(EDJE_CC) -##AC_MSG_CHECKING([Which edje_cc to use]) -##AC_MSG_RESULT(${EDJE_CC}) - -m4_ifdef([v_mic], - [ - EFL_COMPILER_FLAG([-Wshadow]) - EFL_COMPILER_FLAG([-Wall]) - EFL_COMPILER_FLAG([-Wpointer-arith]) - EFL_COMPILER_FLAG([-W]) - EFL_COMPILER_FLAG([-Wno-missing-field-initializers]) - ]) - -AC_OUTPUT([ -Makefile -src/Makefile -module.desktop -$po_makefile_in -], [ -]) - diff --git a/e_modules-wallpaper2.spec.in b/e_modules-wallpaper2.spec.in deleted file mode 100644 index 5564047..0000000 --- a/e_modules-wallpaper2.spec.in +++ /dev/null @@ -1,47 +0,0 @@ -%define module_name wallpaper2 -%{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}} - -Summary: %{module_name} module for the Enlightenment window manager -Name: e_modules-%{module_name} -Version: @VERSION@ -Release: %{_rel} -License: BSD -Group: User Interface/Desktops -URL: http://www.enlightenment.org/ -Source: ftp://ftp.enlightenment.org/pub/enlightenment/%{module_name}-%{version}.tar.gz -Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[email protected]>} -Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} -Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} -BuildRequires: enlightenment-devel >= 0.18.999 -Requires: enlightenment >= 0.18.999 -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%description -%{module_name} module for the Enlightenment window manager. - -%prep -%setup -q -n %{module_name}-%{version} - -%build -%{configure} -%{__make} %{?_smp_mflags} %{?mflags} - -%install -%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install -%{find_lang} %{module_name} || true > %{module_name}.lang - -%clean -test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -f %{module_name}.lang -%defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING* INSTALL NEWS README -%{_libdir}/enlightenment/modules/%{module_name}* - -%changelog diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..ed664a4 --- /dev/null +++ b/meson.build @@ -0,0 +1,66 @@ + +#### Project #### +project('wallpaper2`', 'c', + license: 'BSD 2 clause', + meson_version: '>= 0.47.0') + +gettext_domain = 'e-module-' + meson.project_name() + + +#### Enlightenemnt #### +dep_e = dependency('enlightenment') +e_modules_dir = dep_e.get_pkgconfig_variable('modules') +e_release = dep_e.get_pkgconfig_variable('release') + + +#### Host arch #### +host_os = host_machine.system() +if host_os == 'linux' + cc = meson.get_compiler('c') + if cc.has_header_symbol('features.h', '__UCLIBC__') + host_os = 'linux-uclibc' + elif cc.has_header_symbol('features.h', '__dietlibc__') + host_os = 'linux-dietlibc' + else + host_os = 'linux-gnu' + endif +endif +mod_arch = '@0@-@1@-@2@'.format(host_os, host_machine.cpu_family(), e_release) + + +#### Install dirs #### +mod_install_dir = join_paths(e_modules_dir, meson.project_name()) +lib_install_dir = join_paths(mod_install_dir, mod_arch) + + +#### config.h #### +config_h = configuration_data() +config_h.set_quoted('PACKAGE', meson.project_name()) +config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) +config_h.set_quoted('LOCALEDOMAIN', gettext_domain) +config_dir = include_directories('.') + + +#### i18n #### +dep_intl = [] +if get_option('nls') + config_h.set('HAVE_GETTEXT', '1') + dep_intl = cc.find_library('intl', required : false) + subdir('po') +endif + + +#### Edje cc #### +edje_cc = find_program('edje_cc') + + +#### module sources #### +subdir('src') + +#### write config file #### +configure_file(output: 'config.h', configuration: config_h) + + +#### Data files #### +install_data('module.desktop', install_dir: mod_install_dir) + diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..df2a862 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,4 @@ +option('nls', + type: 'boolean', + value: true, + description: 'enable localization: (default=true)') diff --git a/module.desktop.in b/module.desktop.in deleted file mode 100644 index 1100bda..0000000 --- a/module.desktop.in +++ /dev/null @@ -1,33 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Link -Name=Wallpaper 2 -Name[ca]=Fons d'escriptori -Name[cs]=Pozadí plochy -Name[eo]=Tapeto -Name[es]=Fondo de pantalla -Name[fr]=Fond d'écran 2 -Name[gl]=Fondo de escritorio 2 -Name[hu]=Háttérkép -Name[it]=Sfondo 2 -Name[ms]=Kertas Dinding 2 -Name[pt]=Papel de parede 2 -Name[ru]=Обои 2 -Name[sr]=Позадина површи 2 -Name[tr]=Duvarkağıdı 2 -Comment=Used to pick a wallpaper. -Comment[ca]=Permet seleccionar el fons d'escriptori. -Comment[cs]=Použit k volbě pozadí. -Comment[eo]=Elekti tapeton. -Comment[es]=Para elegir un fondo de pantalla. -Comment[fr]=Sélection du fond d'écran. -Comment[gl]=Usado para escoller un fondo de pantalla. -Comment[hu]=Háttérkép beállító modul. -Comment[it]=Usato per selezionare uno sfondo. -Comment[ms]=Digunakan untuk mendapatkan kertas dinding. -Comment[pt]=Permite-lhe escolher o papel de parede -Comment[ru]=Используется для выбора обоев. -Comment[sr]=Користи се за одабир слике радне површи. -Comment[tr]=Duvarkağıdı seçiminde kullanılır. -Icon=preferences-desktop-wallpaper -X-Enlightenment-ModuleType=settings diff --git a/po/Makevars b/po/Makevars deleted file mode 100644 index 5b54556..0000000 --- a/po/Makevars +++ /dev/null @@ -1,42 +0,0 @@ -# Makefile variables for PO directory in any package using GNU gettext. - -# Usually the message domain is the same as the package name. -DOMAIN = $(PACKAGE) - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -# These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=N_ --keyword=D_ --keyword=DP_:1,2 \ - --from-code=UTF-8 --foreign-user - -# This is the copyright holder that gets inserted into the header of the -# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -# package. (Note that the msgstr strings, extracted from the package's -# sources, belong to the copyright holder of the package.) Translators are -# expected to transfer the copyright for their translations to this person -# or entity, or to disclaim their copyright. The empty string stands for -# the public domain; in this case the translators are expected to disclaim -# their copyright. -COPYRIGHT_HOLDER = Enlightenment development team - -# This is the email address or URL to which the translators shall report -# bugs in the untranslated strings: -# - Strings which are not entire sentences, see the maintainer guidelines -# in the GNU gettext documentation, section 'Preparing Strings'. -# - Strings which use unclear terms or require additional context to be -# understood. -# - Strings which make invalid assumptions about notation of date, time or -# money. -# - Pluralisation problems. -# - Incorrect English spelling. -# - Incorrect formatting. -# It can be your email address, or a mailing list address where translators -# can write to without being subscribed, or the URL of a web page through -# which the translators can contact you. -MSGID_BUGS_ADDRESS = [email protected] - -# This is the list of locale categories, beyond LC_MESSAGES, for which the -# message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = diff --git a/po/POTFILES.in b/po/POTFILES.in deleted file mode 100644 index 0c404c4..0000000 --- a/po/POTFILES.in +++ /dev/null @@ -1,2 +0,0 @@ -src/e_int_config_wallpaper.c -src/e_mod_main.c diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 0000000..99ae8f1 --- /dev/null +++ b/po/meson.build @@ -0,0 +1,9 @@ +i18n = import('i18n') + +i18n.gettext(gettext_domain, + args: [ + '--keyword=N_', + '--keyword=D_', + '--from-code=UTF-8', + '--foreign-user' + ]) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 391f9d4..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -AM_CPPFLAGS = -I. \ - -I$(top_srcdir) \ - -I$(includedir) \ - -DLOCALEDIR=\"$(datadir)/locale\" \ - -DPACKAGE_DATA_DIR=\"$(module_dir)/$(PACKAGE)\" \ - @E_CFLAGS@ - -pkgdir = $(module_dir)/$(PACKAGE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = e_mod_main.h \ - e_mod_main.c \ - e_int_config_wallpaper.c - -module_la_LIBADD = @E_LIBS@ -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - -clean-local: - rm -rf *~ diff --git a/src/e_int_config_wallpaper.c b/src/e_int_config_wallpaper.c index 8048994..91359aa 100644 --- a/src/e_int_config_wallpaper.c +++ b/src/e_int_config_wallpaper.c @@ -706,11 +706,12 @@ _pan_sel(Evas_Object *obj, Item *it) if (p) { p++; - name = strdupa(p); + name = strdup(p); p = strrchr(name, '.'); if (p) *p = 0; } edje_object_part_text_set(sd->info->bg, "e.text.filename", name); + if (name) free(name); } else { @@ -942,11 +943,12 @@ _pan_file_add(Evas_Object *obj, const char *file, Eina_Bool remote, Eina_Bool th if (p) { p++; - name = strdupa(p); + name = strdup(p); p = strrchr(name, '.'); if (p) *p = 0; } edje_object_part_text_set(sd->info->bg, "e.text.filename", name); + if (name) free(name); } } } @@ -1196,7 +1198,7 @@ wp_browser_new(E_Comp *comp EINA_UNUSED) // preview info->preview = e_livethumb_add(info->evas); e_livethumb_vsize_set(info->preview, zone->w, zone->h); - edje_extern_object_aspect_set(info->preview, EDJE_ASPECT_CONTROL_NEITHER, + evas_object_size_hint_aspect_set(info->preview, EVAS_ASPECT_CONTROL_NEITHER, zone->w, zone->h); edje_object_part_swallow(info->bg, "e.swallow.preview", info->preview); evas_object_show(info->preview); diff --git a/src/e_mod_main.c b/src/e_mod_main.c index ee8493f..882f48e 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -39,7 +39,6 @@ e_modapi_init(E_Module *m) // } conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/e_mod_main.h b/src/e_mod_main.h index a3bcd01..d99bec0 100644 --- a/src/e_mod_main.h +++ b/src/e_mod_main.h @@ -1,6 +1,5 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H - #include <string.h> #ifdef ENABLE_NLS diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..31a09d3 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,11 @@ +module = shared_module( + 'module', + 'e_mod_main.c', + 'e_int_config_wallpaper.c', + + dependencies : [dep_e, dep_intl], + install_dir: lib_install_dir, + include_directories: config_dir, + install: true, + name_prefix: '', +) --
