From e72ab4a6598c37d29aed08a2f09c8fd58138c743 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 29 Oct 2014 21:09:07 +1100 Subject: various packages: run `make cleanup-style` --- index.html | 44 ++++++++++++++++++++++---------------------- src/glib.mk | 4 ++-- src/intltool.mk | 2 +- src/libcaca.mk | 2 +- src/luabind-test.cpp | 6 +++--- src/oce.mk | 2 +- src/qscintilla2.mk | 4 ++-- src/sdl_image.mk | 2 +- src/sdl_sound.mk | 2 +- src/vidstab-test.c | 2 +- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/index.html b/index.html index e3241e8..efd8bfd 100644 --- a/index.html +++ b/index.html @@ -2148,7 +2148,7 @@ local-pkg-list: $(LOCAL_PKG_LIST) qt3d Qt - + qtactiveqt Qt @@ -3073,9 +3073,9 @@ endef
2014-xx-xx – Release 2.23

- The stable branch was updated to the - current development version after a thorough testing + The stable branch was updated to the + current development version after a thorough testing phase.

@@ -3100,28 +3100,28 @@ endef

- Unfortunately, a number of factors have forced us to drop support - for MinGW 3 (i.e. "MinGW.org"), - in favor of the MinGW-w64 toolchain. This decision was made in a - large part because of the dropping of support for MinGW by - GLib and Qt5, - which arguably are two of the most important packages in MXE. - Other considerations have also been taken, like the lack - of maintainership in MinGW and potential legal - challenges that comes with using supplemental DirectX - headers in MinGW in order to support Qt4. Worse yet, having to - support the unsupported MinGW toolchain impedes adding or - updating packages, as shown in the pull + Unfortunately, a number of factors have forced us to drop support + for MinGW 3 (i.e. "MinGW.org"), + in favor of the MinGW-w64 toolchain. This decision was made in a + large part because of the dropping of support for MinGW by + GLib and Qt5, + which arguably are two of the most important packages in MXE. + Other considerations have also been taken, like the lack + of maintainership in MinGW and potential legal + challenges that comes with using supplemental DirectX + headers in MinGW in order to support Qt4. Worse yet, having to + support the unsupported MinGW toolchain impedes adding or + updating packages, as shown in the pull request of updating GLib.

- Please note that dropping support for MinGW DOES NOT + Please note that dropping support for MinGW DOES NOT MEAN dropping support for the 32-bit architecture. MinGW-w64 also supports 32-bit target through i686-w64-mingw32.

diff --git a/src/glib.mk b/src/glib.mk index d711855..d6f0c1f 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -69,8 +69,8 @@ define $(PKG)_BUILD # Detecting if these GLib tools are already available on host machine, # either because of a host package installation or from an earlier MXE # installation of GLib. - # If it is installed, we symlink it into the MXE bin/. - # If not, we build it. + # If it is installed, we symlink it into the MXE bin/. + # If not, we build it. $(if $(findstring y,\ $(shell [ -x "`which glib-genmarshal`" ] && \ [ -x "`which glib-compile-schemas`" ] && \ diff --git a/src/intltool.mk b/src/intltool.mk index db051b7..84287cf 100644 --- a/src/intltool.mk +++ b/src/intltool.mk @@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://launchpad.net/intltool/trunk/$($(PKG)_VERSION)/+download/$($(PKG)_FILE) -$(PKG)_DEPS := +$(PKG)_DEPS := define $(PKG)_UPDATE $(WGET) -q -O- 'https://launchpad.net/intltool/+download' | \ diff --git a/src/libcaca.mk b/src/libcaca.mk index 221ed9f..86672ca 100644 --- a/src/libcaca.mk +++ b/src/libcaca.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD cd '$(1)' && autoreconf -fi $(if $(BUILD_STATIC), \ - $(SED) -i 's/__declspec(dllimport)//' '$(1)/caca/caca.h'; \ + $(SED) -i 's/__declspec(dllimport)//' '$(1)/caca/caca.h'; \ $(SED) -i 's/__declspec(dllimport)//' '$(1)/caca/caca0.h') cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ diff --git a/src/luabind-test.cpp b/src/luabind-test.cpp index 02f2638..45efb3d 100644 --- a/src/luabind-test.cpp +++ b/src/luabind-test.cpp @@ -23,7 +23,7 @@ extern "C" int init(lua_State* L) int main() { - lua_State* L = luaL_newstate(); - init(L); - luaL_dostring(L, "greet()"); + lua_State* L = luaL_newstate(); + init(L); + luaL_dostring(L, "greet()"); } diff --git a/src/oce.mk b/src/oce.mk index ce499fa..b91e37a 100644 --- a/src/oce.mk +++ b/src/oce.mk @@ -25,7 +25,7 @@ define $(PKG)_BUILD -DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \ -DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \ -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE - + $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' diff --git a/src/qscintilla2.mk b/src/qscintilla2.mk index 228ecd0..e2755d2 100644 --- a/src/qscintilla2.mk +++ b/src/qscintilla2.mk @@ -25,8 +25,8 @@ define $(PKG)_BUILD '$(TARGET)-g++' \ -W -Wall -Werror -std=c++0x -pedantic \ - `'$(TARGET)-pkg-config' Qt5Widgets --cflags` \ + `'$(TARGET)-pkg-config' Qt5Widgets --cflags` \ '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-qscintilla2.exe' -lqscintilla2 \ - `'$(TARGET)-pkg-config' Qt5Widgets --libs` + `'$(TARGET)-pkg-config' Qt5Widgets --libs` endef diff --git a/src/sdl_image.mk b/src/sdl_image.mk index 00ce88c..09064cd 100644 --- a/src/sdl_image.mk +++ b/src/sdl_image.mk @@ -38,7 +38,7 @@ define $(PKG)_BUILD -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_image.exe' \ `'$(TARGET)-pkg-config' SDL_image --cflags --libs` - + mkdir -p '$(1)/cmake-build-test' cp '$(2)-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt' cp '$(2).c' '$(1)/cmake-build-test/' diff --git a/src/sdl_sound.mk b/src/sdl_sound.mk index 8c3df16..85d1bf6 100644 --- a/src/sdl_sound.mk +++ b/src/sdl_sound.mk @@ -57,7 +57,7 @@ define $(PKG)_BUILD -W -Wall -Werror -std=c99 -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_sound.exe' \ `'$(TARGET)-pkg-config' SDL_sound --cflags --libs` - + mkdir -p '$(1)/cmake-build-test' cp '$(2)-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt' cp '$(2).c' '$(1)/cmake-build-test/' diff --git a/src/vidstab-test.c b/src/vidstab-test.c index 8c99149..ab6c47d 100644 --- a/src/vidstab-test.c +++ b/src/vidstab-test.c @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) if (vsMotionDetectInit(&md, &conf, &fi) != VS_OK) return 1; - + vsMotionDetectionCleanup(&md); return 0; -- cgit v0.12