137 files changed, 171 insertions, 142 deletions
diff --git a/Makefile.test b/Makefile.test index 00cc906..55700f1 100644 --- a/Makefile.test +++ b/Makefile.test @@ -76,6 +76,8 @@ defconfig : ./scripts/kconfig/conf -d ./config.in +export + -include $(TOPDIR)/.config -include $(TOPDIR)/..config.cmd -include $(TOPDIR)/.depends @@ -84,7 +86,9 @@ export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) all clean: $(subdir-y) -$(subdir-y) : $(TOPDIR)/stamp-headers $(TOPDIR)/library/custom.h +$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ + $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ + $(TOPDIR)/library/custom.h clean : $(TOPDIR)/.config @@ -25,6 +25,7 @@ $(TOPDIR)/.depends.cfgs: @-rm -f dirs $(TOPDIR)/stamp-headers : + @-rm -f $(TOPDIR)/stamp-headers* mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) @@ -36,6 +37,27 @@ $(TOPDIR)/stamp-headers : ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h + ( cd $(QTDIR)/include; \ + $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ + qcopchannel_qws.h qwindowsystem_qws.h \ + qfontmanager_qws.h qwsdefaultdecoration_qws.h)) + touch $@ + +$(TOPDIR)/stamp-headers-x11 : + @-rm -f $(TOPDIR)/stamp-headers* + mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ + $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private + ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) + ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) + ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) + ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) + ( cd include/opie && ln -sf ../../libsql/*.h .; ) + ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) + ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ + ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) + ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h + ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) + cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) touch $@ $(TOPDIR)/library/custom.h : $(TOPDIR)/.config @@ -59,7 +81,7 @@ define descend endef define makefilegen - cd $(shell dirname $(1)); $(TOPDIR)/qmake/qmake $(3) -o $(shell basename $(1)) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro + cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro endef define makecfg diff --git a/core/applets/batteryapplet/config.in b/core/applets/batteryapplet/config.in index 5cf8b12..16fe8f4 100644 --- a/core/applets/batteryapplet/config.in +++ b/core/applets/batteryapplet/config.in @@ -3,5 +3,5 @@ menu "batteryapplet" config BATTERYAPPLET boolean "batteryapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE endmenu diff --git a/core/applets/cardmon/config.in b/core/applets/cardmon/config.in index 0f74814..328b2e1 100644 --- a/core/applets/cardmon/config.in +++ b/core/applets/cardmon/config.in @@ -1,4 +1,4 @@ config CARDMON boolean "cardmon" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/clipboardapplet/config.in b/core/applets/clipboardapplet/config.in index 4ac0039..0b69fe0 100644 --- a/core/applets/clipboardapplet/config.in +++ b/core/applets/clipboardapplet/config.in @@ -1,4 +1,4 @@ config CLIPBOARDAPPLET boolean "clipboardapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/clockapplet/config.in b/core/applets/clockapplet/config.in index 9c5f080..3ca12fe 100644 --- a/core/applets/clockapplet/config.in +++ b/core/applets/clockapplet/config.in @@ -1,4 +1,4 @@ config CLOCKAPPLET boolean "clockapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/homeapplet/config.in b/core/applets/homeapplet/config.in index 3e37837..feb8097 100644 --- a/core/applets/homeapplet/config.in +++ b/core/applets/homeapplet/config.in @@ -1,4 +1,4 @@ config HOMEAPPLET boolean "homeapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in index c8e3667..0b2fc51 100644 --- a/core/applets/irdaapplet/config.in +++ b/core/applets/irdaapplet/config.in @@ -1,4 +1,4 @@ config IRDAAPPLET boolean "irdaapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/logoutapplet/config.in b/core/applets/logoutapplet/config.in index a822e0e..3dc0408 100644 --- a/core/applets/logoutapplet/config.in +++ b/core/applets/logoutapplet/config.in @@ -1,4 +1,4 @@ config LOGOUTAPPLET boolean "logoutapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/obex/config.in b/core/applets/obex/config.in index 4b6440d..33771db 100644 --- a/core/applets/obex/config.in +++ b/core/applets/obex/config.in @@ -1,4 +1,4 @@ config OBEX boolean "obex" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/restartapplet/config.in b/core/applets/restartapplet/config.in index 5c132c8..827b7ca 100644 --- a/core/applets/restartapplet/config.in +++ b/core/applets/restartapplet/config.in @@ -3,5 +3,5 @@ menu "restartapplet" config #RESTARTAPPLET boolean "restartapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE endmenu diff --git a/core/applets/screenshotapplet/config.in b/core/applets/screenshotapplet/config.in index 645ea3a..94e2b84 100644 --- a/core/applets/screenshotapplet/config.in +++ b/core/applets/screenshotapplet/config.in @@ -1,4 +1,4 @@ config SCREENSHOTAPPLET boolean "screenshotapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/suspendapplet/config.in b/core/applets/suspendapplet/config.in index 21ba192..4d3c42d 100644 --- a/core/applets/suspendapplet/config.in +++ b/core/applets/suspendapplet/config.in @@ -1,4 +1,4 @@ config SUSPENDAPPLET boolean "suspendapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/vmemo/config.in b/core/applets/vmemo/config.in index f0857a2..bcf02f2 100644 --- a/core/applets/vmemo/config.in +++ b/core/applets/vmemo/config.in @@ -1,4 +1,4 @@ config VMEMO boolean "vmemo" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in index 64037b2..f65faeb 100644 --- a/core/applets/volumeapplet/config.in +++ b/core/applets/volumeapplet/config.in @@ -1,4 +1,4 @@ config VOLUMEAPPLET boolean "volumeapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/apps/calibrate/config.in b/core/apps/calibrate/config.in index 0a7d5da..e408448 100644 --- a/core/apps/calibrate/config.in +++ b/core/apps/calibrate/config.in @@ -1,4 +1,4 @@ # config #CALIBRATE # boolean "calibrate" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/apps/embeddedkonsole/config.in b/core/apps/embeddedkonsole/config.in index 6272667..a31d393 100644 --- a/core/apps/embeddedkonsole/config.in +++ b/core/apps/embeddedkonsole/config.in @@ -1,4 +1,4 @@ config EMBEDDEDKONSOLE boolean "embeddedkonsole" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/apps/helpbrowser/config.in b/core/apps/helpbrowser/config.in index 0614e44..aeeb483 100644 --- a/core/apps/helpbrowser/config.in +++ b/core/apps/helpbrowser/config.in @@ -1,4 +1,4 @@ config HELPBROWSER boolean "helpbrowser" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/apps/qcop/config.in b/core/apps/qcop/config.in index 9508714..f2cf066 100644 --- a/core/apps/qcop/config.in +++ b/core/apps/qcop/config.in @@ -1,4 +1,4 @@ config QCOP boolean "qcop" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/apps/textedit/config.in b/core/apps/textedit/config.in index fae02ac..ee4bca9 100644 --- a/core/apps/textedit/config.in +++ b/core/apps/textedit/config.in @@ -1,4 +1,4 @@ config TEXTEDIT boolean "textedit" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/launcher/config.in b/core/launcher/config.in index 87b678d..e6e664d 100644 --- a/core/launcher/config.in +++ b/core/launcher/config.in @@ -1,4 +1,4 @@ config LAUNCHER boolean "launcher" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/multimedia/opieplayer/config.in b/core/multimedia/opieplayer/config.in index 8d4ccf4..0757f94 100644 --- a/core/multimedia/opieplayer/config.in +++ b/core/multimedia/opieplayer/config.in @@ -1,9 +1,9 @@ menu "opieplayer" - config #LIBFFMPEG + config OPIEPLAYER boolean "opieplayer" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE source core/multimedia/opieplayer/libffmpeg/config.in source core/multimedia/opieplayer/libflash/config.in source core/multimedia/opieplayer/libmad/config.in diff --git a/core/multimedia/opieplayer/libflash/config.in b/core/multimedia/opieplayer/libflash/config.in index 58a02a4..91a57da 100644 --- a/core/multimedia/opieplayer/libflash/config.in +++ b/core/multimedia/opieplayer/libflash/config.in @@ -1,4 +1,4 @@ # config #LIBFLASH # boolean "libflash" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/multimedia/opieplayer/libmad/config.in b/core/multimedia/opieplayer/libmad/config.in index 3534637..03354b6 100644 --- a/core/multimedia/opieplayer/libmad/config.in +++ b/core/multimedia/opieplayer/libmad/config.in @@ -1,4 +1,4 @@ config LIBMAD boolean "libmad" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/multimedia/opieplayer/libmpeg3/config.in b/core/multimedia/opieplayer/libmpeg3/config.in index e0f15c0..a72865f 100644 --- a/core/multimedia/opieplayer/libmpeg3/config.in +++ b/core/multimedia/opieplayer/libmpeg3/config.in @@ -1,4 +1,4 @@ config LIBMPEG3 boolean "libmpeg3" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/multimedia/opieplayer/modplug/config.in b/core/multimedia/opieplayer/modplug/config.in index 065208f..67fbe8c 100644 --- a/core/multimedia/opieplayer/modplug/config.in +++ b/core/multimedia/opieplayer/modplug/config.in @@ -1,4 +1,4 @@ config MODPLUG boolean "modplug" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/multimedia/opieplayer/wavplugin/config.in b/core/multimedia/opieplayer/wavplugin/config.in index a044366..c5201c7 100644 --- a/core/multimedia/opieplayer/wavplugin/config.in +++ b/core/multimedia/opieplayer/wavplugin/config.in @@ -1,4 +1,4 @@ config WAVPLUGIN boolean "wavplugin" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/opie-login/config.in b/core/opie-login/config.in index 4980dad..fe5cc7e 100644 --- a/core/opie-login/config.in +++ b/core/opie-login/config.in @@ -1,4 +1,4 @@ config OPIE-LOGIN boolean "opie-login" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/pim/addressbook/config.in b/core/pim/addressbook/config.in index 5362077..522541c 100644 --- a/core/pim/addressbook/config.in +++ b/core/pim/addressbook/config.in @@ -1,4 +1,4 @@ config ADDRESSBOOK boolean "addressbook" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/pim/datebook/config.in b/core/pim/datebook/config.in index 7cc92bd..42d4f52 100644 --- a/core/pim/datebook/config.in +++ b/core/pim/datebook/config.in @@ -1,4 +1,4 @@ config DATEBOOK boolean "datebook" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/pim/today/config.in b/core/pim/today/config.in index 695b708..6bcdbe2 100644 --- a/core/pim/today/config.in +++ b/core/pim/today/config.in @@ -3,6 +3,6 @@ menu "today" config TODAY boolean "today" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE source core/pim/today/plugins/config.in endmenu diff --git a/core/pim/today/plugins/datebook/config.in b/core/pim/today/plugins/datebook/config.in index 7d1e006..7a14438 100644 --- a/core/pim/today/plugins/datebook/config.in +++ b/core/pim/today/plugins/datebook/config.in @@ -1,4 +1,4 @@ config TODAY_DATEBOOK boolean "datebook" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/pim/today/plugins/mail/config.in b/core/pim/today/plugins/mail/config.in index f40696a..6f4450f 100644 --- a/core/pim/today/plugins/mail/config.in +++ b/core/pim/today/plugins/mail/config.in @@ -1,4 +1,4 @@ config TODAY_MAIL boolean "mail" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/pim/today/plugins/todolist/config.in b/core/pim/today/plugins/todolist/config.in index aef4ea4..48ba226 100644 --- a/core/pim/today/plugins/todolist/config.in +++ b/core/pim/today/plugins/todolist/config.in @@ -1,4 +1,4 @@ config TODAY_TODOLIST boolean "todolist" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/pim/todo/config.in b/core/pim/todo/config.in index 8b456de..4f7da10 100644 --- a/core/pim/todo/config.in +++ b/core/pim/todo/config.in @@ -1,4 +1,4 @@ config TODO boolean "todo" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/settings/citytime/config.in b/core/settings/citytime/config.in index 429c30f..f40252a 100644 --- a/core/settings/citytime/config.in +++ b/core/settings/citytime/config.in @@ -1,4 +1,4 @@ config CITYTIME boolean "citytime" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/settings/launcher/config.in b/core/settings/launcher/config.in index 8a71b69..19fedd8 100644 --- a/core/settings/launcher/config.in +++ b/core/settings/launcher/config.in @@ -1,4 +1,4 @@ config LAUNCHER-SETTINGS boolean "launcher" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/settings/light-and-power/config.in b/core/settings/light-and-power/config.in index 77302eb..8ebc714 100644 --- a/core/settings/light-and-power/config.in +++ b/core/settings/light-and-power/config.in @@ -1,4 +1,4 @@ config LIGHT-AND-POWER boolean "light-and-power" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/core/settings/security/config.in b/core/settings/security/config.in index 648371d..73b6b8d 100644 --- a/core/settings/security/config.in +++ b/core/settings/security/config.in @@ -1,4 +1,4 @@ config SECURITY boolean "security" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/development/keyview/config.in b/development/keyview/config.in index a151d58..ce934d3 100644 --- a/development/keyview/config.in +++ b/development/keyview/config.in @@ -1,4 +1,4 @@ # config #KEYVIEW # boolean "keyview" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/example/config.in b/example/config.in index 7487ef1..b3e07d3 100644 --- a/example/config.in +++ b/example/config.in @@ -1,4 +1,4 @@ # config #EXAMPLE # boolean "example" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/freetype/config.in b/freetype/config.in index 061a18f..df59c49 100644 --- a/freetype/config.in +++ b/freetype/config.in @@ -1,4 +1,4 @@ config FREETYPE boolean "freetype" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/inputmethods/dvorak/config.in b/inputmethods/dvorak/config.in index 317e1e3..f74717c 100644 --- a/inputmethods/dvorak/config.in +++ b/inputmethods/dvorak/config.in @@ -1,4 +1,4 @@ config DVORAK boolean "dvorak" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/inputmethods/handwriting/config.in b/inputmethods/handwriting/config.in index 3738f24..8fd5315 100644 --- a/inputmethods/handwriting/config.in +++ b/inputmethods/handwriting/config.in @@ -1,4 +1,4 @@ config HANDWRITING boolean "handwriting" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/inputmethods/jumpx/config.in b/inputmethods/jumpx/config.in index 32c2125..01635fd 100644 --- a/inputmethods/jumpx/config.in +++ b/inputmethods/jumpx/config.in @@ -1,4 +1,4 @@ config JUMPX boolean "jumpx" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/inputmethods/keyboard/config.in b/inputmethods/keyboard/config.in index 03f4c1a..e260685 100644 --- a/inputmethods/keyboard/config.in +++ b/inputmethods/keyboard/config.in @@ -1,4 +1,4 @@ config KEYBOARD boolean "keyboard" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/inputmethods/kjumpx/config.in b/inputmethods/kjumpx/config.in index 132f06a..8e0b5c2 100644 --- a/inputmethods/kjumpx/config.in +++ b/inputmethods/kjumpx/config.in @@ -1,4 +1,4 @@ config KJUMPX boolean "kjumpx" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/inputmethods/multikey/config.in b/inputmethods/multikey/config.in index 7e6e268..da3eb9b 100644 --- a/inputmethods/multikey/config.in +++ b/inputmethods/multikey/config.in @@ -1,4 +1,4 @@ config MULTIKEY boolean "multikey" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/inputmethods/pickboard/config.in b/inputmethods/pickboard/config.in index 490effd..3b71e85 100644 --- a/inputmethods/pickboard/config.in +++ b/inputmethods/pickboard/config.in @@ -1,4 +1,4 @@ config PICKBOARD boolean "pickboard" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/inputmethods/unikeyboard/config.in b/inputmethods/unikeyboard/config.in index 1ecd5dc..80bae0d 100644 --- a/inputmethods/unikeyboard/config.in +++ b/inputmethods/unikeyboard/config.in @@ -1,4 +1,4 @@ config UNIKEYBOARD boolean "unikeyboard" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/library/config.in b/library/config.in index 3fb4529..e87d1d2 100644 --- a/library/config.in +++ b/library/config.in @@ -1,3 +1,5 @@ config LIBQPE boolean "Qpe library" - default "y" + default "y" if ! X11 + default "n" if X11 + depends on ! X11 diff --git a/libsql/test/config.in b/libsql/test/config.in index 258bfe6..238d27f 100644 --- a/libsql/test/config.in +++ b/libsql/test/config.in @@ -1,4 +1,4 @@ # config #TEST # boolean "test" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in index a2f7d4d..6a90f19 100644 --- a/noncore/applets/notesapplet/config.in +++ b/noncore/applets/notesapplet/config.in @@ -1,4 +1,4 @@ config NOTESAPPLET boolean "notesapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/applets/wirelessapplet/config.in b/noncore/applets/wirelessapplet/config.in index 55f1aa1..e502f93 100644 --- a/noncore/applets/wirelessapplet/config.in +++ b/noncore/applets/wirelessapplet/config.in @@ -1,4 +1,4 @@ config WIRELESSAPPLET boolean "wirelessapplet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/apps/advancedfm/config.in b/noncore/apps/advancedfm/config.in index 968d373..c1e25c2 100644 --- a/noncore/apps/advancedfm/config.in +++ b/noncore/apps/advancedfm/config.in @@ -1,4 +1,4 @@ config ADVANCEDFM boolean "advancedfm" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/apps/checkbook/config.in b/noncore/apps/checkbook/config.in index 89ab053..3a7993b 100644 --- a/noncore/apps/checkbook/config.in +++ b/noncore/apps/checkbook/config.in @@ -1,4 +1,4 @@ config CHECKBOOK boolean "checkbook" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/apps/confedit/config.in b/noncore/apps/confedit/config.in index 13e6d27..09bb9df 100644 --- a/noncore/apps/confedit/config.in +++ b/noncore/apps/confedit/config.in @@ -1,4 +1,4 @@ config CONFEDIT boolean "confedit" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/apps/dictionary/config.in b/noncore/apps/dictionary/config.in index 2527127..e3afbfc 100644 --- a/noncore/apps/dictionary/config.in +++ b/noncore/apps/dictionary/config.in @@ -1,4 +1,4 @@ # config #DICTIONARY # boolean "dictionary" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/apps/opie-console/config.in b/noncore/apps/opie-console/config.in index f7793fa..01c9a1c 100644 --- a/noncore/apps/opie-console/config.in +++ b/noncore/apps/opie-console/config.in @@ -3,6 +3,6 @@ menu "opie-console" config #TEST boolean "opie-console" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE source noncore/apps/opie-console/test/config.in endmenu diff --git a/noncore/apps/opie-reader/config.in b/noncore/apps/opie-reader/config.in index 801c4d9..9d63eb2 100644 --- a/noncore/apps/opie-reader/config.in +++ b/noncore/apps/opie-reader/config.in @@ -1,4 +1,4 @@ config OPIE-READER boolean "opie-reader" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/apps/opie-sheet/config.in b/noncore/apps/opie-sheet/config.in index 7b66faf..d9450bb 100644 --- a/noncore/apps/opie-sheet/config.in +++ b/noncore/apps/opie-sheet/config.in @@ -1,4 +1,4 @@ config OPIE-SHEET boolean "opie-sheet" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/apps/opie-write/config.in b/noncore/apps/opie-write/config.in index 79650e9..9842b4b 100644 --- a/noncore/apps/opie-write/config.in +++ b/noncore/apps/opie-write/config.in @@ -1,4 +1,4 @@ # config #OPIE-WRITE # boolean "opie-write" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/apps/oxygen/config.in b/noncore/apps/oxygen/config.in index b83022a..1fd0987 100644 --- a/noncore/apps/oxygen/config.in +++ b/noncore/apps/oxygen/config.in @@ -1,4 +1,4 @@ config OXYGEN boolean "oxygen" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/apps/tableviewer/config.in b/noncore/apps/tableviewer/config.in index 8490d5d..31fadc0 100644 --- a/noncore/apps/tableviewer/config.in +++ b/noncore/apps/tableviewer/config.in @@ -1,4 +1,4 @@ config TABLEVIEWER boolean "tableviewer" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/comm/keypebble/config.in b/noncore/comm/keypebble/config.in index 7a81539..107d510 100644 --- a/noncore/comm/keypebble/config.in +++ b/noncore/comm/keypebble/config.in @@ -1,4 +1,4 @@ config KEYPEBBLE boolean "keypebble" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/comm/mobilemsg/config.in b/noncore/comm/mobilemsg/config.in index a7f92ff..45c4ca4 100644 --- a/noncore/comm/mobilemsg/config.in +++ b/noncore/comm/mobilemsg/config.in @@ -1,4 +1,4 @@ # config #MOBILEMSG # boolean "mobilemsg" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/decorations/flat/config.in b/noncore/decorations/flat/config.in index 80dc87d..74fc990 100644 --- a/noncore/decorations/flat/config.in +++ b/noncore/decorations/flat/config.in @@ -1,4 +1,4 @@ config DECO_FLAT boolean "flat" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/decorations/liquid/config.in b/noncore/decorations/liquid/config.in index 946d97d..2f41734 100644 --- a/noncore/decorations/liquid/config.in +++ b/noncore/decorations/liquid/config.in @@ -1,4 +1,4 @@ config DECO_LIQUID boolean "liquid" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/decorations/polished/config.in b/noncore/decorations/polished/config.in index 9feb134..df6c514 100644 --- a/noncore/decorations/polished/config.in +++ b/noncore/decorations/polished/config.in @@ -1,4 +1,4 @@ config DECO_POLISHED boolean "polished" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/bounce/config.in b/noncore/games/bounce/config.in index c7f2c02..92ea429 100644 --- a/noncore/games/bounce/config.in +++ b/noncore/games/bounce/config.in @@ -1,4 +1,4 @@ config BOUNCE boolean "bounce" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/buzzword/config.in b/noncore/games/buzzword/config.in index ad2525e..757daee 100644 --- a/noncore/games/buzzword/config.in +++ b/noncore/games/buzzword/config.in @@ -1,4 +1,4 @@ config BUZZWORD boolean "buzzword" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/chess/config.in b/noncore/games/chess/config.in index e64e73c..6cddb51 100644 --- a/noncore/games/chess/config.in +++ b/noncore/games/chess/config.in @@ -1,4 +1,4 @@ # config #CHESS # boolean "chess" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/fifteen/config.in b/noncore/games/fifteen/config.in index da35a05..880e178 100644 --- a/noncore/games/fifteen/config.in +++ b/noncore/games/fifteen/config.in @@ -1,4 +1,4 @@ config FIFTEEN boolean "fifteen" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/go/config.in b/noncore/games/go/config.in index da542c3..25395f7 100644 --- a/noncore/games/go/config.in +++ b/noncore/games/go/config.in @@ -1,4 +1,4 @@ config GO boolean "go" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/kbill/config.in b/noncore/games/kbill/config.in index 91a14d1..eb1900e 100644 --- a/noncore/games/kbill/config.in +++ b/noncore/games/kbill/config.in @@ -1,4 +1,4 @@ config KBILL boolean "kbill" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/kcheckers/config.in b/noncore/games/kcheckers/config.in index 1a3c60b..a0226f0 100644 --- a/noncore/games/kcheckers/config.in +++ b/noncore/games/kcheckers/config.in @@ -1,4 +1,4 @@ config KCHECKERS boolean "kcheckers" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/kpacman/config.in b/noncore/games/kpacman/config.in index c8a4bc6..4e1befa 100644 --- a/noncore/games/kpacman/config.in +++ b/noncore/games/kpacman/config.in @@ -1,4 +1,4 @@ config KPACMAN boolean "kpacman" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/mindbreaker/config.in b/noncore/games/mindbreaker/config.in index f141ebc..8eff9da 100644 --- a/noncore/games/mindbreaker/config.in +++ b/noncore/games/mindbreaker/config.in @@ -1,4 +1,4 @@ config MINDBREAKER boolean "mindbreaker" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/minesweep/config.in b/noncore/games/minesweep/config.in index 90934b9..74c9e0d 100644 --- a/noncore/games/minesweep/config.in +++ b/noncore/games/minesweep/config.in @@ -1,4 +1,4 @@ config MINESWEEP boolean "minesweep" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/parashoot/config.in b/noncore/games/parashoot/config.in index db6239c..956bdbb 100644 --- a/noncore/games/parashoot/config.in +++ b/noncore/games/parashoot/config.in @@ -1,4 +1,4 @@ config PARASHOOT boolean "parashoot" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/qasteroids/config.in b/noncore/games/qasteroids/config.in index a619624..74eaa07 100644 --- a/noncore/games/qasteroids/config.in +++ b/noncore/games/qasteroids/config.in @@ -1,4 +1,4 @@ config QASTEROIDS boolean "qasteroids" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/snake/config.in b/noncore/games/snake/config.in index 0048f9c..eade45e 100644 --- a/noncore/games/snake/config.in +++ b/noncore/games/snake/config.in @@ -1,4 +1,4 @@ config SNAKE boolean "snake" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/solitaire/config.in b/noncore/games/solitaire/config.in index 8264469..20dce9e 100644 --- a/noncore/games/solitaire/config.in +++ b/noncore/games/solitaire/config.in @@ -1,4 +1,4 @@ config SOLITAIRE boolean "solitaire" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/tetrix/config.in b/noncore/games/tetrix/config.in index 596d2b5..e7d3993 100644 --- a/noncore/games/tetrix/config.in +++ b/noncore/games/tetrix/config.in @@ -1,4 +1,4 @@ config TETRIX boolean "tetrix" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/tictac/config.in b/noncore/games/tictac/config.in index 9b65b8d..eff34ca 100644 --- a/noncore/games/tictac/config.in +++ b/noncore/games/tictac/config.in @@ -1,4 +1,4 @@ config TICTAC boolean "tictac" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/games/wordgame/config.in b/noncore/games/wordgame/config.in index 3969dc8..32b6eac 100644 --- a/noncore/games/wordgame/config.in +++ b/noncore/games/wordgame/config.in @@ -1,4 +1,4 @@ config WORDGAME boolean "wordgame" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/graphics/drawpad/config.in b/noncore/graphics/drawpad/config.in index 732330b..50fa916 100644 --- a/noncore/graphics/drawpad/config.in +++ b/noncore/graphics/drawpad/config.in @@ -1,4 +1,4 @@ config DRAWPAD boolean "drawpad" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/multimedia/opieplayer2/config.in b/noncore/multimedia/opieplayer2/config.in index 2a03125..da0a647 100644 --- a/noncore/multimedia/opieplayer2/config.in +++ b/noncore/multimedia/opieplayer2/config.in @@ -1,4 +1,4 @@ # config #OPIEPLAYER2 # boolean "opieplayer2" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/multimedia/showimg/config.in b/noncore/multimedia/showimg/config.in index 0316ea6..0540c72 100644 --- a/noncore/multimedia/showimg/config.in +++ b/noncore/multimedia/showimg/config.in @@ -1,4 +1,4 @@ config SHOWIMG boolean "showimg" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/networksetup/config.in b/noncore/net/networksetup/config.in index b18bdbd..e151d6f 100644 --- a/noncore/net/networksetup/config.in +++ b/noncore/net/networksetup/config.in @@ -3,7 +3,7 @@ menu "networksetup" config INTERFACES boolean "networksetup" default "y" - depends LIBQPE && LIBOPIE && WLAN && INTERFACES + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES source noncore/net/networksetup/wlan/config.in source noncore/net/networksetup/interfaces/config.in diff --git a/noncore/net/networksetup/interfaces/config.in b/noncore/net/networksetup/interfaces/config.in index 431e51b..b9873f7 100644 --- a/noncore/net/networksetup/interfaces/config.in +++ b/noncore/net/networksetup/interfaces/config.in @@ -1,4 +1,4 @@ config INTERFACES boolean "interfaces" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/networksetup/wlan/config.in b/noncore/net/networksetup/wlan/config.in index 4853a32..7f552fc 100644 --- a/noncore/net/networksetup/wlan/config.in +++ b/noncore/net/networksetup/wlan/config.in @@ -1,4 +1,4 @@ config WLAN boolean "wlan" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/opieftp/config.in b/noncore/net/opieftp/config.in index fdb0e90..9d1e561 100644 --- a/noncore/net/opieftp/config.in +++ b/noncore/net/opieftp/config.in @@ -1,4 +1,4 @@ config OPIEFTP boolean "opieftp" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/opieirc/config.in b/noncore/net/opieirc/config.in index 7aaa5d3..30184a9 100644 --- a/noncore/net/opieirc/config.in +++ b/noncore/net/opieirc/config.in @@ -1,4 +1,4 @@ config OPIEIRC boolean "opieirc" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/opietooth/applet/config.in b/noncore/net/opietooth/applet/config.in index 80afbe5..4d689b5 100644 --- a/noncore/net/opietooth/applet/config.in +++ b/noncore/net/opietooth/applet/config.in @@ -1,4 +1,4 @@ # config #APPLET # boolean "applet" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/opietooth/blue-pin/config.in b/noncore/net/opietooth/blue-pin/config.in index c3e3056..395537c 100644 --- a/noncore/net/opietooth/blue-pin/config.in +++ b/noncore/net/opietooth/blue-pin/config.in @@ -1,4 +1,4 @@ # config #BLUE-PIN # boolean "blue-pin" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/opietooth/lib/config.in b/noncore/net/opietooth/lib/config.in index a8964f6..21c2fa3 100644 --- a/noncore/net/opietooth/lib/config.in +++ b/noncore/net/opietooth/lib/config.in @@ -1,4 +1,4 @@ # config #LIB # boolean "lib" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/opietooth/manager/config.in b/noncore/net/opietooth/manager/config.in index 704448f..a8c9f62 100644 --- a/noncore/net/opietooth/manager/config.in +++ b/noncore/net/opietooth/manager/config.in @@ -1,4 +1,4 @@ # config #MANAGER # boolean "manager" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/ubrowser/config.in b/noncore/net/ubrowser/config.in index 4b15046..562741d 100644 --- a/noncore/net/ubrowser/config.in +++ b/noncore/net/ubrowser/config.in @@ -1,4 +1,4 @@ # config #UBROWSER # boolean "ubrowser" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/net/wellenreiter/config.in b/noncore/net/wellenreiter/config.in index ff4a0cb..d6b48d8 100644 --- a/noncore/net/wellenreiter/config.in +++ b/noncore/net/wellenreiter/config.in @@ -1,4 +1,4 @@ # config #WELLENREITER # boolean "wellenreiter" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/appearance2/config.in b/noncore/settings/appearance2/config.in index e853545..0da6502 100644 --- a/noncore/settings/appearance2/config.in +++ b/noncore/settings/appearance2/config.in @@ -1,4 +1,4 @@ config APPEARANCE2 boolean "appearance2" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/aqpkg/config.in b/noncore/settings/aqpkg/config.in index b16c0b8..4b5ffa7 100644 --- a/noncore/settings/aqpkg/config.in +++ b/noncore/settings/aqpkg/config.in @@ -1,4 +1,4 @@ config AQPKG boolean "aqpkg" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/backup/config.in b/noncore/settings/backup/config.in index 5fc09ef..b59f33f 100644 --- a/noncore/settings/backup/config.in +++ b/noncore/settings/backup/config.in @@ -1,4 +1,4 @@ config BACKUP boolean "backup" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/language/config.in b/noncore/settings/language/config.in index 1315904..ce5e335 100644 --- a/noncore/settings/language/config.in +++ b/noncore/settings/language/config.in @@ -1,4 +1,4 @@ config LANGUAGE boolean "language" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/mediummount/config.in b/noncore/settings/mediummount/config.in index 2bf9442..76e9500 100644 --- a/noncore/settings/mediummount/config.in +++ b/noncore/settings/mediummount/config.in @@ -1,4 +1,4 @@ config MEDIUMMOUNT boolean "mediummount" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/netsystemtime/config.in b/noncore/settings/netsystemtime/config.in index 0420d8e..697c1ea 100644 --- a/noncore/settings/netsystemtime/config.in +++ b/noncore/settings/netsystemtime/config.in @@ -1,4 +1,4 @@ config NETSYSTEMTIME boolean "netsystemtime" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/networksettings/config.in b/noncore/settings/networksettings/config.in index b18bdbd..e151d6f 100644 --- a/noncore/settings/networksettings/config.in +++ b/noncore/settings/networksettings/config.in @@ -3,7 +3,7 @@ menu "networksetup" config INTERFACES boolean "networksetup" default "y" - depends LIBQPE && LIBOPIE && WLAN && INTERFACES + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES source noncore/net/networksetup/wlan/config.in source noncore/net/networksetup/interfaces/config.in diff --git a/noncore/settings/networksettings/interfaces/config.in b/noncore/settings/networksettings/interfaces/config.in index 431e51b..b9873f7 100644 --- a/noncore/settings/networksettings/interfaces/config.in +++ b/noncore/settings/networksettings/interfaces/config.in @@ -1,4 +1,4 @@ config INTERFACES boolean "interfaces" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in index 4853a32..7f552fc 100644 --- a/noncore/settings/networksettings/wlan/config.in +++ b/noncore/settings/networksettings/wlan/config.in @@ -1,4 +1,4 @@ config WLAN boolean "wlan" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/sound/config.in b/noncore/settings/sound/config.in index 5e0b52f..e99b200 100644 --- a/noncore/settings/sound/config.in +++ b/noncore/settings/sound/config.in @@ -1,4 +1,4 @@ config SOUND boolean "sound" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/sshkeys/config.in b/noncore/settings/sshkeys/config.in index 634aa3a..1e7f626 100644 --- a/noncore/settings/sshkeys/config.in +++ b/noncore/settings/sshkeys/config.in @@ -1,4 +1,4 @@ config SSHKEYS boolean "sshkeys" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/sysinfo/config.in b/noncore/settings/sysinfo/config.in index 062f035..f321b94 100644 --- a/noncore/settings/sysinfo/config.in +++ b/noncore/settings/sysinfo/config.in @@ -1,4 +1,4 @@ config SYSINFO boolean "sysinfo" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/tabmanager/config.in b/noncore/settings/tabmanager/config.in index f0c4c08..3737058 100644 --- a/noncore/settings/tabmanager/config.in +++ b/noncore/settings/tabmanager/config.in @@ -1,4 +1,4 @@ config TABMANAGER boolean "tabmanager" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/settings/usermanager/config.in b/noncore/settings/usermanager/config.in index 2dd0b9e..5484a4e 100644 --- a/noncore/settings/usermanager/config.in +++ b/noncore/settings/usermanager/config.in @@ -1,4 +1,4 @@ config USERMANAGER boolean "usermanager" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/styles/flat/config.in b/noncore/styles/flat/config.in index 1c82de1..ae6edb6 100644 --- a/noncore/styles/flat/config.in +++ b/noncore/styles/flat/config.in @@ -1,4 +1,4 @@ config FLAT boolean "flat" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/styles/fresh/config.in b/noncore/styles/fresh/config.in index f71de8d..7199c18 100644 --- a/noncore/styles/fresh/config.in +++ b/noncore/styles/fresh/config.in @@ -1,4 +1,4 @@ config FRESH boolean "fresh" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/styles/liquid/config.in b/noncore/styles/liquid/config.in index d2bbddb..b510625 100644 --- a/noncore/styles/liquid/config.in +++ b/noncore/styles/liquid/config.in @@ -1,4 +1,4 @@ config LIQUID boolean "liquid" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/styles/metal/config.in b/noncore/styles/metal/config.in index 1d86924..991fc74 100644 --- a/noncore/styles/metal/config.in +++ b/noncore/styles/metal/config.in @@ -1,4 +1,4 @@ config METAL boolean "metal" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/styles/theme/config.in b/noncore/styles/theme/config.in index c90a422..27c8125 100644 --- a/noncore/styles/theme/config.in +++ b/noncore/styles/theme/config.in @@ -1,4 +1,4 @@ config THEME boolean "theme" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/todayplugins/stockticker/config.in b/noncore/todayplugins/stockticker/config.in index e9ee1b7..036b04c 100644 --- a/noncore/todayplugins/stockticker/config.in +++ b/noncore/todayplugins/stockticker/config.in @@ -3,7 +3,7 @@ menu "stockticker" config TODAY_STOCKTICKER boolean "stockticker" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE source noncore/todayplugins/stockticker/stockticker/config.in source noncore/todayplugins/stockticker/stocktickerlib/config.in diff --git a/noncore/tools/calc2/binary/config.in b/noncore/tools/calc2/binary/config.in index 7db862d..3a90707 100644 --- a/noncore/tools/calc2/binary/config.in +++ b/noncore/tools/calc2/binary/config.in @@ -1,4 +1,4 @@ # config #BINARY # boolean "binary" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/tools/calc2/simple/config.in b/noncore/tools/calc2/simple/config.in index 726b78d..a22a020 100644 --- a/noncore/tools/calc2/simple/config.in +++ b/noncore/tools/calc2/simple/config.in @@ -1,4 +1,4 @@ # config #SIMPLE # boolean "simple" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/tools/calculator/config.in b/noncore/tools/calculator/config.in index 9a8d8be..a290e5e 100644 --- a/noncore/tools/calculator/config.in +++ b/noncore/tools/calculator/config.in @@ -1,4 +1,4 @@ config CALCULATOR boolean "calculator" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/tools/clock/config.in b/noncore/tools/clock/config.in index c9c099c..341b42a 100644 --- a/noncore/tools/clock/config.in +++ b/noncore/tools/clock/config.in @@ -1,4 +1,4 @@ config CLOCK boolean "clock" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/tools/formatter/config.in b/noncore/tools/formatter/config.in index 70146bd..89c05e2 100644 --- a/noncore/tools/formatter/config.in +++ b/noncore/tools/formatter/config.in @@ -1,4 +1,4 @@ config FORMATTER boolean "formatter" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/tools/opie-sh/config.in b/noncore/tools/opie-sh/config.in index 77c1857..782ae5f 100644 --- a/noncore/tools/opie-sh/config.in +++ b/noncore/tools/opie-sh/config.in @@ -1,4 +1,4 @@ config OPIE-SH boolean "opie-sh" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/tools/remote/config.in b/noncore/tools/remote/config.in index ef51047..231696b 100644 --- a/noncore/tools/remote/config.in +++ b/noncore/tools/remote/config.in @@ -1,4 +1,4 @@ config REMOTE boolean "remote" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/unsupported/filebrowser/config.in b/noncore/unsupported/filebrowser/config.in index 46debbd..02c6521 100644 --- a/noncore/unsupported/filebrowser/config.in +++ b/noncore/unsupported/filebrowser/config.in @@ -1,4 +1,4 @@ config FILEBROWSER boolean "filebrowser" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/unsupported/gsmtool/config.in b/noncore/unsupported/gsmtool/config.in index 76c7eb7..f023d61 100644 --- a/noncore/unsupported/gsmtool/config.in +++ b/noncore/unsupported/gsmtool/config.in @@ -1,4 +1,4 @@ # config #GSMTOOL # boolean "gsmtool" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/unsupported/mail2/bend/config.in b/noncore/unsupported/mail2/bend/config.in index 3d33fe4..1cea22f 100644 --- a/noncore/unsupported/mail2/bend/config.in +++ b/noncore/unsupported/mail2/bend/config.in @@ -1,4 +1,4 @@ config BEND boolean "bend" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/unsupported/mail2/config.in b/noncore/unsupported/mail2/config.in index 2263230..4c50723 100644 --- a/noncore/unsupported/mail2/config.in +++ b/noncore/unsupported/mail2/config.in @@ -3,7 +3,7 @@ menu "mail" config BEND boolean "mail" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE source noncore/mail/bend/config.in source noncore/mail/libmail/config.in endmenu diff --git a/noncore/unsupported/mail2/libmail/config.in b/noncore/unsupported/mail2/libmail/config.in index 6712dbe..e9ce917 100644 --- a/noncore/unsupported/mail2/libmail/config.in +++ b/noncore/unsupported/mail2/libmail/config.in @@ -1,4 +1,4 @@ config LIBMAIL boolean "libmail" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/unsupported/oipkg/config.in b/noncore/unsupported/oipkg/config.in index 63a96e3..987994e 100644 --- a/noncore/unsupported/oipkg/config.in +++ b/noncore/unsupported/oipkg/config.in @@ -1,4 +1,4 @@ config OIPKG boolean "oipkg" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/noncore/unsupported/qpdf/config.in b/noncore/unsupported/qpdf/config.in index 2f0dc9d..dfd4f0a 100644 --- a/noncore/unsupported/qpdf/config.in +++ b/noncore/unsupported/qpdf/config.in @@ -1,4 +1,4 @@ config QPDF boolean "qpdf" default "y" - depends LIBQPE && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE @@ -16,7 +16,7 @@ #CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeg libffmpeg.pro #CONFIG_LIBFLASH core/multimedia/opieplayer/libflash libflash.pro #CONFIG_LIBOPIE_PIM libopie/pim pim.pro -#CONFIG_LIBQPE-X11 x11/libqpe-x11 libqpe-x11.pro +CONFIG_LIBQPE-X11 x11/libqpe-x11 libqpe-x11.pro #CONFIG_LIBSQL libsql libsql.pro #CONFIG_MANAGER noncore/net/opietooth/manager manager.pro #CONFIG_MOBILEMSG noncore/comm/mobilemsg mobilemsg.pro @@ -30,7 +30,7 @@ #CONFIG_RESTARTAPPLET core/applets/restartapplet restartapplet.pro #CONFIG_RESTARTAPPLET2 core/applets/restartapplet2 restartapplet2.pro #CONFIG_SDMON noncore/unsupported/sdmon sdmon.pro -#CONFIG_SERVER x11/ipc/server server.pro +CONFIG_OCOPSERVER x11/ipc/server ocopserver.pro #CONFIG_SIMPLE noncore/tools/calc2/simple simple.pro #CONFIG_SMTP noncore/unsupported/opiemail/ifaces/smtp smtp.pro #CONFIG_SPREADSHEET noncore/unsupported/spreadsheet spreadsheet.pro diff --git a/quickexec/config.in b/quickexec/config.in index ece5e3b..57eac96 100644 --- a/quickexec/config.in +++ b/quickexec/config.in @@ -1,4 +1,4 @@ # config #QUICKEXEC # boolean "quickexec" # default "y" -# depends LIBQPE && LIBOPIE +# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE diff --git a/x11/libqpe-x11/config.in b/x11/libqpe-x11/config.in index 2e546a4..841d639 100644 --- a/x11/libqpe-x11/config.in +++ b/x11/libqpe-x11/config.in @@ -1,4 +1,5 @@ -# config #LIBQPE-X11 -# boolean "libqpe-x11" -# default "y" -# depends LIBQPE && LIBOPIE +config LIBQPE-X11 + boolean "Qpe library (x11 enabled)" + default "y" if X11 + default "n" if ! X11 + depends on X11 |