pidgin/android/libpurple

win32: upgrade libxml2; switch to OBS and temporarily downgrade nss and nspr (should be bumped up at OBS in few days)

2013-04-09, Tomasz Wasilczyk
65c29307e55d
Parents 0ab9ed685a54
Children 27edd939f0ba
win32: upgrade libxml2; switch to OBS and temporarily downgrade nss and nspr (should be bumped up at OBS in few days)
4 files changed, 14 insertions(+), 23 deletions(-)
  • +2 -14
    libpurple/plugins/ssl/Makefile.mingw
  • +2 -2
    libpurple/win32/global.mak
  • +5 -5
    pidgin/win32/nsis/generate_gtk_zip.sh
  • +5 -2
    pidgin/win32/prepare-workspace.sh
    • --- a/libpurple/plugins/ssl/Makefile.mingw Mon Apr 08 18:08:54 2013 +0200
    +++ b/libpurple/plugins/ssl/Makefile.mingw Tue Apr 09 20:16:09 2013 +0200
    @@ -13,18 +13,6 @@
    TARGET = ssl
    TARGET_NSS = ssl-nss
    -NEEDED_DLLS = \
    - $(NSS_TOP)/lib/freebl3.dll \
    - $(NSS_TOP)/lib/libnspr4.dll \
    - $(NSS_TOP)/lib/libplc4.dll \
    - $(NSS_TOP)/lib/libplds4.dll \
    - $(NSS_TOP)/lib/nss3.dll \
    - $(NSS_TOP)/lib/nssutil3.dll \
    - $(NSS_TOP)/lib/smime3.dll \
    - $(NSS_TOP)/lib/softokn3.dll \
    - $(NSS_TOP)/lib/sqlite3.dll \
    - $(NSS_TOP)/lib/ssl3.dll
    -
    ##
    ## INCLUDE PATHS
    ##
    @@ -35,7 +23,8 @@
    -I$(PURPLE_TOP) \
    -I$(PURPLE_TOP)/win32 \
    -I$(PIDGIN_TREE_TOP) \
    - -I$(NSS_TOP)/include
    + -I$(NSS_TOP)/include/nspr4 \
    + -I$(NSS_TOP)/include/nss3
    LIB_PATHS += -L$(GTK_TOP)/lib \
    -L$(PURPLE_TOP) \
    @@ -74,7 +63,6 @@
    install: all $(PURPLE_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_DIR)
    cp $(TARGET).dll $(PURPLE_INSTALL_PLUGINS_DIR)
    cp $(TARGET_NSS).dll $(PURPLE_INSTALL_PLUGINS_DIR)
    - cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)
    $(OBJECTS) $(OBJECTS_NSS): $(PURPLE_CONFIG_H)
    --- a/libpurple/win32/global.mak Mon Apr 08 18:08:54 2013 +0200
    +++ b/libpurple/win32/global.mak Tue Apr 09 20:16:09 2013 +0200
    @@ -16,9 +16,9 @@
    GTK_BIN ?= $(GTK_TOP)/bin
    BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
    JSON_GLIB_TOP ?= $(WIN32_DEV_TOP)/json-glib-0.14
    -LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.8
    +LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9
    MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0
    -NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.14.3-nspr-4.9.5
    +NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.13
    PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
    SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
    TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.5
    --- a/pidgin/win32/nsis/generate_gtk_zip.sh Mon Apr 08 18:08:54 2013 +0200
    +++ b/pidgin/win32/nsis/generate_gtk_zip.sh Tue Apr 09 20:16:09 2013 +0200
    @@ -102,9 +102,11 @@
    LIBSSP="${DOWNLOAD_HOST}mingw32-libssp-4.8.0-6.1.noarch.rpm LibSSP 4.8.0-6.1 sha1sum:c05b2e0470f41d26f8ebfff93dfd51263842a4ea"
    LIBSTDCPP="${DOWNLOAD_HOST}mingw32-libstdc++-4.7.2-2.4.noarch.rpm libstdc++ 4.7.2-2.4 sha1sum:e031fad6b7bf54c9846d5a857bb8de6faefdcd1b"
    LIBTIFF="${DOWNLOAD_HOST}mingw32-libtiff-4.0.2-1.4.noarch.rpm libtiff 4.0.2-1.4 sha1sum:9a8f8b018e8bafd47067fe6fd0debc1e887239b1"
    -LIBXML="${DOWNLOAD_HOST}mingw32-libxml2-2.8.0-2.6.noarch.rpm libxml 2.8.0-2.6 sha1sum:9be07823d7074362abac17bf7a7b092659aed002"
    -LIBXSLT="${DOWNLOAD_HOST}mingw32-libxslt-1.1.27-1.4.noarch.rpm libxslt 1.1.27-1.4 sha1sum:4a08612ad73235b0fab95e17644d72e8f24097c3"
    +LIBXML="${DOWNLOAD_HOST}mingw32-libxml2-2.9.0-2.1.noarch.rpm libxml 2.9.0-2.1 sha1sum:de73090544effcd167f94fcfe8e2d1f005adbea7"
    +LIBXSLT="${DOWNLOAD_HOST}mingw32-libxslt-1.1.28-1.1.noarch.rpm libxslt 1.1.28-1.1 sha1sum:b43448edbbb04d72e355bd45d5bee94414395589"
    MEANW="${DOWNLOAD_HOST}mingw32-meanwhile-1.0.2-2.6.noarch.rpm Meanwhile 1.0.2-2.6 sha1sum:afce5c0157c270ee30c049fdabd7328fa3b3233e"
    +MOZNSS="${DOWNLOAD_HOST}mingw32-mozilla-nss-3.13.3-1.6.noarch.rpm NSS 3.13.3-1.6 sha1sum:5eebc0aba6849a782d245c4a6938cc26449dbdb9"
    +MOZNSPR="${DOWNLOAD_HOST}mingw32-mozilla-nspr-4.9-2.6.noarch.rpm NSPR 4.9-2.6 sha1sum:72cf92fde08ea72d62399f1fd709b918e6339df5"
    PANGO="${DOWNLOAD_HOST}mingw32-pango-1.30.1-1.4.noarch.rpm Pango 1.30.1-1.4 sha1sum:69c4515babdf99b0ded04c24dc3a7f33debac934"
    PIXMAN="${DOWNLOAD_HOST}mingw32-pixman-0.26.0-1.4.noarch.rpm pixman 0.26.0-1.4 sha1sum:f751fe428ea83996daf7e57bff6f4f79361b0d29"
    PTHREADS="${DOWNLOAD_HOST}mingw32-pthreads-2.8.0-14.6.noarch.rpm pthreads 2.8.0-14.6 sha1sum:e948ae221f82bbcb4fbfd991638e4170c150fe9f"
    @@ -118,7 +120,7 @@
    WEBKITGTK="${DOWNLOAD_HOST}mingw32-libwebkitgtk-1.8.3-1.14.noarch.rpm WebKitGTK+ 1.8.3-1.14 sha1sum:ade86455fc2da257f4fe5831367f500a61a1af9a"
    ZLIB="${DOWNLOAD_HOST}mingw32-zlib-1.2.7-1.4.noarch.rpm zlib 1.2.7-1.4 sha1sum:83e91f3b4d14e47131ca33fc69e12b82aabdd589"
    -ALL="ATK CAIRO2 DBUS DBUS_GLIB ENCHANT FONTCONFIG FREETYPE GDK_PIXBUF GEOCLUE GLIB GST GST_INT GTK2 GTKSPELL LIBFFI LIBGCC LIBJASPER LIBICU LIBINTL LIBJPEG LIBJSON LIBLZMA LIBPNG LIBSOUP LIBSSP LIBSTDCPP LIBTIFF LIBXML LIBXSLT MEANW PANGO PIXMAN PTHREADS SQLITE TCL TK WEBKITGTK ZLIB"
    +ALL="ATK CAIRO2 DBUS DBUS_GLIB ENCHANT FONTCONFIG FREETYPE GDK_PIXBUF GEOCLUE GLIB GST GST_INT GTK2 GTKSPELL LIBFFI LIBGCC LIBJASPER LIBICU LIBINTL LIBJPEG LIBJSON LIBLZMA LIBPNG LIBSOUP LIBSSP LIBSTDCPP LIBTIFF LIBXML LIBXSLT MEANW MOZNSS MOZNSPR PANGO PIXMAN PTHREADS SQLITE TCL TK WEBKITGTK ZLIB"
    mkdir -p $STAGE_DIR
    cd $STAGE_DIR
    @@ -210,8 +212,6 @@
    rm "${STAGE_DIR}/../cacert.pem"
    echo "All components ready"
    -cp $INSTALL_DIR/bin/libintl-8.dll $INSTALL_DIR/bin/intl.dll
    -
    #Default GTK+ Theme to MS-Windows (already set)
    #echo gtk-theme-name = \"MS-Windows\" > $INSTALL_DIR/etc/gtk-2.0/gtkrc
    --- a/pidgin/win32/prepare-workspace.sh Mon Apr 08 18:08:54 2013 +0200
    +++ b/pidgin/win32/prepare-workspace.sh Tue Apr 09 20:16:09 2013 +0200
    @@ -23,8 +23,11 @@
    ARC_CSA="${DOWNLOAD_HOST}cyrus-sasl-2.1.25.tar.gz;Cyrus SASL;2.1.25;b9d7f510c0c5daa71ee5225daacdd58e948a8d19;;"
    ARCHIVES+="ARC_CSA "
    -ARC_NSS="${DOWNLOAD_HOST}nss-3.14.3-nspr-4.9.5.tar.gz;NSS;3.14.3;fb11968ac5e3fabc9594324327856f7fba0ba4b0;;"
    +
    +ARC_NSS="${DOWNLOAD_HOST}mingw32-mozilla-nss-devel-3.13.3-1.6.noarch.rpm;NSS;3.13.3-1.6;91ea7f1208264da343de51fba882e11336066190;${OBS_SKIP};nss-3.13"
    ARCHIVES+="ARC_NSS "
    +ARC_NSP="${DOWNLOAD_HOST}mingw32-mozilla-nspr-devel-4.9-2.6.noarch.rpm;NSPR;4.9-2.6;bd348943b8250cf9fc15da0b7c743141f9404033;${OBS_SKIP};nss-3.13"
    +ARCHIVES+="ARC_NSP "
    ARC_PID="${DOWNLOAD_HOST}pidgin-inst-deps-20130214.tar.gz;inst-deps;20130214;372218ab472c4070cd45489dae175dea5638cf17;;"
    ARCHIVES+="ARC_PID "
    @@ -95,7 +98,7 @@
    ARC_JSG="${DOWNLOAD_HOST}mingw32-json-glib-devel-0.14.2-1.7.noarch.rpm;json-glib;0.14.2-1.7;e86a81d5c4bbc7a2ea6b808dd5819c883c4303cc;${OBS_SKIP};json-glib-0.14"
    ARCHIVES+="ARC_JSG "
    -ARC_XML="${DOWNLOAD_HOST}mingw32-libxml2-devel-2.8.0-2.6.noarch.rpm;libxml2;2.8.0-2.6;5ee322c0a3a5b39f690714b1cff9d22338d83bc8;${OBS_SKIP};libxml2-2.8"
    +ARC_XML="${DOWNLOAD_HOST}mingw32-libxml2-devel-2.9.0-2.1.noarch.rpm;libxml2;2.9.0-2.1;bd63823e0be2436ee7d2369aa254e7214a0dd692;${OBS_SKIP};libxml2-2.9"
    ARCHIVES+="ARC_XML "
    ARC_WKG="${DOWNLOAD_HOST}mingw32-libwebkitgtk-devel-1.8.3-1.14.noarch.rpm;WebKitGTK+;1.8.3-1.14;5f2ae2c8c04c4ad4309ba677de886f450db1fe6d;${OBS_SKIP};libwebkitgtk-1.10"