From d2d244a9ea2e47effb95abd622981a49954be338 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 23 Sep 2017 16:53:26 +0200 Subject: fix typos found by misspell tool --- docs/index.html | 2 +- plugins/README.md | 2 +- plugins/apps/qbittorrent-1-fixes.patch | 2 +- src/cmake/modules/FindFriBiDi.cmake | 2 +- src/cmake/modules/FindSDL.cmake | 2 +- src/cmake/modules/FindSDL_image.cmake | 2 +- src/cmake/modules/FindSDL_mixer.cmake | 4 ++-- src/cmake/modules/FindSDL_net.cmake | 4 ++-- src/cmake/modules/FindSDL_sound.cmake | 4 ++-- src/cmake/modules/FindSDL_ttf.cmake | 4 ++-- src/cmake/modules/FindTIFF.cmake | 2 +- src/devil-1-fixes.patch | 2 +- src/ghostscript-1-fixes.patch | 2 +- src/hamlib-test.c | 2 +- src/hamlib.mk | 2 +- src/minizip-1-unzOpenBuffer.patch | 2 +- src/ocaml-core.mk | 2 +- src/ocaml-xml-light.mk | 2 +- src/opencv-3-fixes-pkgconfig.patch | 2 +- src/postgresql.mk | 2 +- src/qt-1-cherrypicks.patch | 2 +- tools/build-pkg.lua | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/index.html b/docs/index.html index a610b90..fc24ab5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2660,7 +2660,7 @@ endef Entry on Savannah
  • - First release anouncement + First release announcement and the discussion around it
    • diff --git a/plugins/README.md b/plugins/README.md index 6200938..2347be8 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -111,7 +111,7 @@ This type of package will also work with normal MXE features such as updates and patches. The customisation style (override/overlay) can be trickier since any arbitrary -`make` statements can be used. Most normal variables should be overriden with +`make` statements can be used. Most normal variables should be overridden with [simply expanded variables](https://www.gnu.org/software/make/manual/html_node/Flavors.html#Flavors) i.e. using `:=` instead of `=`. For example, to change a package version: diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch index 4d9cbab..422ac79 100644 --- a/plugins/apps/qbittorrent-1-fixes.patch +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 30 Aug 2015 00:28:50 +0200 -Subject: [PATCH] do not check qmake existance +Subject: [PATCH] do not check qmake existence Fix ./configure error: diff --git a/src/cmake/modules/FindFriBiDi.cmake b/src/cmake/modules/FindFriBiDi.cmake index 6dbfdf8..e09b460 100644 --- a/src/cmake/modules/FindFriBiDi.cmake +++ b/src/cmake/modules/FindFriBiDi.cmake @@ -8,7 +8,7 @@ endif() pkg_check_modules(FRIBIDI fribidi) -# for backward compatiblity +# for backward compatibility set(FRIBIDI_LIBRARY ${FRIBIDI_LIBRARIES}) set(FRIBIDI_INCLUDE_DIR ${FRIBIDI_INCLUDE_DIRS}) set(FRIBIDI_VERSION_STRING ${FRIBIDI_VERSION}) diff --git a/src/cmake/modules/FindSDL.cmake b/src/cmake/modules/FindSDL.cmake index ed238c8..aeea71c 100644 --- a/src/cmake/modules/FindSDL.cmake +++ b/src/cmake/modules/FindSDL.cmake @@ -8,7 +8,7 @@ endif() pkg_check_modules(SDL sdl) -# for backward compatiblity +# for backward compatibility set(SDL_LIBRARY ${SDL_LIBRARIES}) set(SDL_INCLUDE_DIR ${SDL_INCLUDE_DIRS}) set(SDL_VERSION_STRING ${SDL_VERSION}) diff --git a/src/cmake/modules/FindSDL_image.cmake b/src/cmake/modules/FindSDL_image.cmake index 8395403..865f143 100644 --- a/src/cmake/modules/FindSDL_image.cmake +++ b/src/cmake/modules/FindSDL_image.cmake @@ -8,7 +8,7 @@ endif() pkg_check_modules(SDL_IMAGE SDL_image) -# for backward compatiblity +# for backward compatibility set(SDLIMAGE_LIBRARY ${SDL_IMAGE_LIBRARIES}) set(SDL_IMAGE_LIBRARY ${SDL_IMAGE_LIBRARIES}) set(SDLIMAGE_INCLUDE_DIR ${SDL_IMAGE_INCLUDE_DIRS}) diff --git a/src/cmake/modules/FindSDL_mixer.cmake b/src/cmake/modules/FindSDL_mixer.cmake index 9e4986b..27d453c 100644 --- a/src/cmake/modules/FindSDL_mixer.cmake +++ b/src/cmake/modules/FindSDL_mixer.cmake @@ -8,10 +8,10 @@ endif() pkg_check_modules(SDL_MIXER SDL_mixer) -#compatiblity +#compatibility set(SDL_MIXER_VERSION_STRING ${SDL_MIXER_VERSION}) -# for backward compatiblity +# for backward compatibility set(SDLMIXER_LIBRARY ${SDL_MIXER_LIBRARIES}) set(SDLMIXER_INCLUDE_DIR ${SDL_MIXER_INCLUDE_DIRS}) set(SDLMIXER_FOUND ${SDL_MIXER_FOUND}) diff --git a/src/cmake/modules/FindSDL_net.cmake b/src/cmake/modules/FindSDL_net.cmake index 99f70ba..7ef91cf 100644 --- a/src/cmake/modules/FindSDL_net.cmake +++ b/src/cmake/modules/FindSDL_net.cmake @@ -8,10 +8,10 @@ endif() pkg_check_modules(SDL_NET SDL_net) -#compatiblity +#compatibility set(SDL_NET_VERSION_STRING ${SDL_NET_VERSION}) -# for backward compatiblity +# for backward compatibility set(SDLNET_LIBRARY ${SDL_NET_LIBRARIES}) set(SDLNET_INCLUDE_DIR ${SDL_NET_INCLUDE_DIRS}) set(SDLNET_FOUND ${SDL_NET_FOUND}) diff --git a/src/cmake/modules/FindSDL_sound.cmake b/src/cmake/modules/FindSDL_sound.cmake index 58bb776..e0b44e6 100644 --- a/src/cmake/modules/FindSDL_sound.cmake +++ b/src/cmake/modules/FindSDL_sound.cmake @@ -8,9 +8,9 @@ endif() pkg_check_modules(SDL_SOUND SDL_sound) -#compatiblity +#compatibility set(SDL_SOUND_VERSION_STRING ${SDL_SOUND_VERSION}) set(SDL_SOUND_LIBRARIES ${SDL_SOUND_EXTRAS};${SDL_SOUND_LIBRARIES}) -# for backward compatiblity +# for backward compatibility set(SDL_SOUND_LIBRARY ${SDL_SOUND_LIBRARIES}) diff --git a/src/cmake/modules/FindSDL_ttf.cmake b/src/cmake/modules/FindSDL_ttf.cmake index 6427cdc..8301637 100644 --- a/src/cmake/modules/FindSDL_ttf.cmake +++ b/src/cmake/modules/FindSDL_ttf.cmake @@ -8,10 +8,10 @@ endif() pkg_check_modules(SDL_TTF SDL_ttf) -#compatiblity +#compatibility set(SDL_TTF_VERSION_STRING ${SDL_TTF_VERSION}) -# for backward compatiblity +# for backward compatibility set(SDLTTF_LIBRARY ${SDL_TTF_LIBRARIES}) set(SDLTTF_INCLUDE_DIR ${SDL_TTF_INCLUDE_DIRS}) set(SDLTTF_FOUND ${SDL_TTF_FOUND}) diff --git a/src/cmake/modules/FindTIFF.cmake b/src/cmake/modules/FindTIFF.cmake index a5a4996..8c4dbf0 100644 --- a/src/cmake/modules/FindTIFF.cmake +++ b/src/cmake/modules/FindTIFF.cmake @@ -8,7 +8,7 @@ endif() pkg_check_modules(TIFF libtiff-4) -# for backward compatiblity +# for backward compatibility set(TIFF_LIBRARY ${TIFF_LIBRARIES}) set(TIFF_INCLUDE_DIR ${TIFF_INCLUDE_DIRS}) set(TIFF_VERSION_STRING ${TIFF_VERSION}) diff --git a/src/devil-1-fixes.patch b/src/devil-1-fixes.patch index d9e9764..d8ea25f 100644 --- a/src/devil-1-fixes.patch +++ b/src/devil-1-fixes.patch @@ -57,7 +57,7 @@ From: Tony Theodore Date: Thu, 20 Jul 2017 16:34:51 +1000 Subject: [PATCH] fix resource paths -DevIL/src-IL/msvc/IL.rc has wierd EOL issues and patches don't +DevIL/src-IL/msvc/IL.rc has weird EOL issues and patches don't apply - use $(SED) in build rule instead diff --git a/src/ghostscript-1-fixes.patch b/src/ghostscript-1-fixes.patch index ffa30e7..4e21201 100644 --- a/src/ghostscript-1-fixes.patch +++ b/src/ghostscript-1-fixes.patch @@ -1298,7 +1298,7 @@ index 1111111..2222222 100644 +EXEEXTAUX="$EXEEXT" +CROSS_COMPILING=no + -+AC_ARG_VAR(CCAUX, [auxilliary C compiler]) ++AC_ARG_VAR(CCAUX, [auxiliary C compiler]) + +if test "$cross_compiling" = yes ; then + CROSS_COMPILING=yes diff --git a/src/hamlib-test.c b/src/hamlib-test.c index 4248c30..ee382f7 100644 --- a/src/hamlib-test.c +++ b/src/hamlib-test.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) { } /* Try to detect rig */ - /* may be overriden by backend probe */ + /* may be overridden by backend probe */ myport.type.rig = RIG_PORT_SERIAL; myport.parm.serial.rate = 9600; myport.parm.serial.data_bits = 8; diff --git a/src/hamlib.mk b/src/hamlib.mk index 13c5417..d2571ab 100644 --- a/src/hamlib.mk +++ b/src/hamlib.mk @@ -15,7 +15,7 @@ $(PKG)_URL_2 := https://github.com/N0NB/$(PKG)/archive/$($(PKG)_VERSION).tar. $(PKG)_DEPS := gcc libltdl libusb1 libxml2 pthreads # grabbing version from sourceforge -# prefered by Nate N0NB +# preferred by Nate N0NB define $(PKG)_UPDATE $(WGET) -q -O- 'https://sourceforge.net/projects/hamlib/files/hamlib/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ diff --git a/src/minizip-1-unzOpenBuffer.patch b/src/minizip-1-unzOpenBuffer.patch index f8d1f28..34ce536 100644 --- a/src/minizip-1-unzOpenBuffer.patch +++ b/src/minizip-1-unzOpenBuffer.patch @@ -3,7 +3,7 @@ This file is part of MXE. See LICENSE.md for licensing information. This patch has been taken from: https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-zlib -Modifications have been made to accomodate for commit. +Modifications have been made to accommodate for commit. nmoinvaz/minizip@9bccc22efb2d. From c162a3620a3d0d317f59af8ddc2d1605bf5ee4b3 Mon Sep 17 00:00:00 2001 diff --git a/src/ocaml-core.mk b/src/ocaml-core.mk index 751cb85..74eed3f 100644 --- a/src/ocaml-core.mk +++ b/src/ocaml-core.mk @@ -41,7 +41,7 @@ define $(PKG)_BUILD # overwriting the binary versions which ship with the compiler with # ones that contain the filename-win32-dirsep patch. $(MAKE) -C '$(1)' -j 1 coreboot - # second time, otherwise Segfault in some cases (depending on the runing system?) + # second time, otherwise Segfault in some cases (depending on the running system?) $(MAKE) -C '$(1)' -j 1 coreboot $(MAKE) -C '$(1)' -j 1 all # install ocamldoc and camlp4 (non cross versions) diff --git a/src/ocaml-xml-light.mk b/src/ocaml-xml-light.mk index 1c45369..9d92747 100644 --- a/src/ocaml-xml-light.mk +++ b/src/ocaml-xml-light.mk @@ -23,7 +23,7 @@ define $(PKG)_BUILD $(SED) -i 's,ocamlyacc,$(TARGET)-ocamlyacc,g' '$(1)/Makefile' $(SED) -i "s,@installdir@,$(PREFIX)/$(TARGET)/lib/ocaml/xml-light,g" $(1)/Makefile $(MAKE) -C '$(1)' xml_parser.ml - $(MAKE) -C '$(1)' -j 1 # without seperated previous step, does not work + $(MAKE) -C '$(1)' -j 1 # without separated previous step, does not work mkdir -p $(PREFIX)/$(TARGET)/lib/ocaml/xml-light # install.. $(MAKE) -C '$(1)' -j '$(JOBS)' install diff --git a/src/opencv-3-fixes-pkgconfig.patch b/src/opencv-3-fixes-pkgconfig.patch index ba3cd42..6ca9761 100644 --- a/src/opencv-3-fixes-pkgconfig.patch +++ b/src/opencv-3-fixes-pkgconfig.patch @@ -1,6 +1,6 @@ This file is part of MXE. See LICENSE.md for licensing information. -This patch was commited to OpenCV's 2.4 branch and we should be able to drop +This patch was committed to OpenCV's 2.4 branch and we should be able to drop it in the next point release. commit eceada586bbf18fc267e437522ec4f1f23ddc656 diff --git a/src/postgresql.mk b/src/postgresql.mk index f4320a1..8a65448 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -23,7 +23,7 @@ endef define $(PKG)_BUILD cd '$(1)' && autoconf cp -Rp '$(1)' '$(1).native' - # Since we build only client libary, use bogus tzdata to satisfy configure. + # Since we build only client library, use bogus tzdata to satisfy configure. # pthreads is needed in both LIBS and PTHREAD_LIBS cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch index 19039e7..7f99467 100644 --- a/src/qt-1-cherrypicks.patch +++ b/src/qt-1-cherrypicks.patch @@ -290,7 +290,7 @@ needs to be converted by the codec. Codec plugins can also be a nuisance to builders of applications linking to static Qt. This is because the application might need -to explicilty import the static codec plugins which are actually +to explicitly import the static codec plugins which are actually dependencies of QtCore. For these reasons, it has been decided not to have text codec plugins diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index e898727..5eb0798 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -299,7 +299,7 @@ end -- return items ordered in build order -- this means, if item depends on item2, then --- item2 preceeds item1 in the list +-- item2 precedes item1 in the list local function sortForBuild(items, item2deps) local n = #items local item2followers = transpose(item2deps) -- cgit v0.12