From owner-freebsd-gnome@FreeBSD.ORG Thu Jun 9 09:30:17 2011 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBAFE106566B for ; Thu, 9 Jun 2011 09:30:17 +0000 (UTC) (envelope-from ale-oparin@yandex.ru) Received: from forward12.mail.yandex.net (forward12.mail.yandex.net [95.108.130.94]) by mx1.freebsd.org (Postfix) with ESMTP id 6EE438FC16 for ; Thu, 9 Jun 2011 09:30:17 +0000 (UTC) Received: from web140.yandex.ru (web140.yandex.ru [95.108.130.8]) by forward12.mail.yandex.net (Yandex) with ESMTP id 657ADC233B8 for ; Thu, 9 Jun 2011 13:14:43 +0400 (MSD) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1307610883; bh=Nz6u0uJD0vSrIycs7gwyvCAaBO1/MPxAFloAj1jYclk=; h=From:To:Subject:MIME-Version:Message-Id:Date:Content-Type; b=itdNuJ35+E5mJDnRGiTy8Y48WKBCxU33xJux6txUj5GTAAA1acjw1zOWubnEatQ/H zha2Licp3xHzZp7kPKh5/YhrHUmhQflVfFrzTMNq22mu6PzlhFQaTu9OkqS/TZH2wQ JQyrZb0qvH/LosKOXgVBmPOnJzmQXtjoihGYn2/A= Received: from localhost (localhost.localdomain [127.0.0.1]) by web140.yandex.ru (Yandex) with ESMTP id 40CAC499007A for ; Thu, 9 Jun 2011 13:14:43 +0400 (MSD) X-Yandex-Spam: 1 Received: from node-20-140.xdsl.tula.net (node-20-140.xdsl.tula.net [212.12.20.140]) by web140.yandex.ru with HTTP; Thu, 09 Jun 2011 13:14:42 +0400 From: =?koi8-r?B?79DB0snOIOHMxcvTwc7E0g==?= To: gnome@freebsd.org MIME-Version: 1.0 Message-Id: <102061307610882@web140.yandex.ru> Date: Thu, 09 Jun 2011 13:14:42 +0400 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Content-Type: multipart/mixed; boundary="----==--bound.10207.web140.yandex.ru" X-Mailman-Approved-At: Thu, 09 Jun 2011 11:24:24 +0000 Cc: Subject: shotwell patch X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2011 09:30:17 -0000 ------==--bound.10207.web140.yandex.ru Content-Transfer-Encoding: 7bit Content-Type: text/plain Hello! the patches needs to compiling current version of SHOTWELL on FreeBSD. patch.a for file configure.mk patch.b for file src/CheckerboardLayout.vala ------==--bound.10207.web140.yandex.ru Content-Disposition: attachment; filename="patch.a" Content-Transfer-Encoding: base64 Content-Type: application/octet-stream; name="patch.a" KioqIC4uL2NvbmZpZ3VyZS5tawlUaHUgSnVuICA5IDEyOjUwOjM2IDIwMTEKLS0tIGNvbmZpZ3Vy ZS5tawlUaHUgSnVuICA5IDEyOjQ5OjUyIDIwMTEKKioqKioqKioqKioqKioqCioqKiAxLDUgKioq KgohIC1uIFBSRUZJWD0vdXNyL2xvY2FsCiAgRElTQUJMRV9JQ09OX1VQREFURT0xCiAgU0NIRU1B X0ZJTEVfRElSPS91c3IvbG9jYWwvZXRjL2djb25mL3NjaGVtYXMKICAKICBDT05GSUdfSU49Y29u ZmlndXJlLm1rCi0tLSAxLDUgLS0tLQohIFBSRUZJWD0vdXNyL2xvY2FsCiAgRElTQUJMRV9JQ09O X1VQREFURT0xCiAgU0NIRU1BX0ZJTEVfRElSPS91c3IvbG9jYWwvZXRjL2djb25mL3NjaGVtYXMK ICAKICBDT05GSUdfSU49Y29uZmlndXJlLm1rCg== ------==--bound.10207.web140.yandex.ru Content-Disposition: attachment; filename="patch.b" Content-Transfer-Encoding: base64 Content-Type: application/octet-stream; name="patch.b" KioqIC4uL0NoZWNrZXJib2FyZExheW91dC52YWxhCVRodSBKdW4gIDkgMTI6NTE6MDMgMjAxMQot LS0gQ2hlY2tlcmJvYXJkTGF5b3V0LnZhbGEJVGh1IEp1biAgOSAxMjo1MDowMiAyMDExCioqKioq KioqKioqKioqKgoqKiogOTMwLDk0NiAqKioqCiAgICAgICAgICAgICAgcm93X3JlY3QueCA9IDA7 CiAgICAgICAgICAgICAgcm93X3JlY3QueSA9IHJvdy55OwogICAgICAgICAgICAgIHJvd19yZWN0 LndpZHRoID0gYWxsb2NhdGlvbi53aWR0aDsKICAgICAgICAgICAgICByb3dfcmVjdC5oZWlnaHQg PSByb3cuaGVpZ2h0OwogICAgICAgICAgICAgIAohICAgICAgICAgICAgIGlmIChhcmVhLmludGVy c2VjdChyb3dfcmVjdCwgYml0YnVja2V0KSkgewogICAgICAgICAgICAgICAgICAvLyBzZWUgd2hh dCBlbGVtZW50cywgaWYgYW55LCBpbnRlcnNlY3QgdGhlIGFyZWEKICAgICAgICAgICAgICAgICAg Zm9yZWFjaCAoQ2hlY2tlcmJvYXJkSXRlbSBpdGVtIGluIHJvdy5pdGVtcykgewogICAgICAgICAg ICAgICAgICAgICAgaWYgKGl0ZW0gPT0gbnVsbCkKICAgICAgICAgICAgICAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgICAgICAgICAgICAgIAohICAgICAgICAgICAgICAgICAgICAgaWYg KGFyZWEuaW50ZXJzZWN0KGl0ZW0uYWxsb2NhdGlvbiwgYml0YnVja2V0KSkKICAgICAgICAgICAg ICAgICAgICAgICAgICBpbnRlcnNlY3RzLmFkZChpdGVtKTsKICAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgIH0KICAgICAgICAgIH0KICAKLS0tIDkzMCw5NDYgLS0tLQogICAgICAgICAg ICAgIHJvd19yZWN0LnggPSAwOwogICAgICAgICAgICAgIHJvd19yZWN0LnkgPSByb3cueTsKICAg ICAgICAgICAgICByb3dfcmVjdC53aWR0aCA9IGFsbG9jYXRpb24ud2lkdGg7CiAgICAgICAgICAg ICAgcm93X3JlY3QuaGVpZ2h0ID0gcm93LmhlaWdodDsKICAgICAgICAgICAgICAKISAgICAgICAg ICAgICBpZiAoYXJlYS5pbnRlcnNlY3Qocm93X3JlY3QsIG91dCBiaXRidWNrZXQpKSB7CiAgICAg ICAgICAgICAgICAgIC8vIHNlZSB3aGF0IGVsZW1lbnRzLCBpZiBhbnksIGludGVyc2VjdCB0aGUg YXJlYQogICAgICAgICAgICAgICAgICBmb3JlYWNoIChDaGVja2VyYm9hcmRJdGVtIGl0ZW0gaW4g cm93Lml0ZW1zKSB7CiAgICAgICAgICAgICAgICAgICAgICBpZiAoaXRlbSA9PSBudWxsKQogICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgICAgICAgCiEg ICAgICAgICAgICAgICAgICAgICBpZiAoYXJlYS5pbnRlcnNlY3QoaXRlbS5hbGxvY2F0aW9uLCBv dXQgYml0YnVja2V0KSkKICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcnNlY3RzLmFkZChp dGVtKTsKICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgIH0KICAgICAgICAgIH0KICAK KioqKioqKioqKioqKioqCioqKiAxNDYzLDE0NzMgKioqKgogICAgICAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgICAgICAgfQogICAgICAgICAgICAgIAogICAgICAgICAgICAgIC8vIG9ubHkg bWFyayBhcmVhIGFzIGRpcnR5IGlmIHZpc2libGUgaW4gdmlld3BvcnQKICAgICAgICAgICAgICBH ZGsuUmVjdGFuZ2xlIGludGVyc2VjdGlvbiA9IEdkay5SZWN0YW5nbGUoKTsKISAgICAgICAgICAg ICBpZiAoIXZpc2libGVfcGFnZS5pbnRlcnNlY3QoaXRlbS5hbGxvY2F0aW9uLCBpbnRlcnNlY3Rp b24pKQogICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAKICAgICAgICAg ICAgICAvLyBncm93IHRoZSBkaXJ0eSBhcmVhCiAgICAgICAgICAgICAgaWYgKGRpcnR5LndpZHRo ID09IDAgfHwgZGlydHkuaGVpZ2h0ID09IDApCiAgICAgICAgICAgICAgICAgIGRpcnR5ID0gaW50 ZXJzZWN0aW9uOwotLS0gMTQ2MywxNDczIC0tLS0KICAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAKICAgICAgICAgICAgICAvLyBvbmx5IG1hcmsg YXJlYSBhcyBkaXJ0eSBpZiB2aXNpYmxlIGluIHZpZXdwb3J0CiAgICAgICAgICAgICAgR2RrLlJl Y3RhbmdsZSBpbnRlcnNlY3Rpb24gPSBHZGsuUmVjdGFuZ2xlKCk7CiEgICAgICAgICAgICAgaWYg KCF2aXNpYmxlX3BhZ2UuaW50ZXJzZWN0KGl0ZW0uYWxsb2NhdGlvbiwgb3V0IGludGVyc2VjdGlv bikpCiAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgIAogICAgICAgICAg ICAgIC8vIGdyb3cgdGhlIGRpcnR5IGFyZWEKICAgICAgICAgICAgICBpZiAoZGlydHkud2lkdGgg PT0gMCB8fCBkaXJ0eS5oZWlnaHQgPT0gMCkKICAgICAgICAgICAgICAgICAgZGlydHkgPSBpbnRl cnNlY3Rpb247CioqKioqKioqKioqKioqKgoqKiogMTYwMSwxNjExICoqKioKICAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgICAKICAgICAgICAgIC8vIGZpbmQgdGhlIHZpc2libGUgaW50ZXJz ZWN0aW9uIG9mIHRoZSB2aWV3cG9ydCBhbmQgdGhlIHNlbGVjdGlvbiBiYW5kCiAgICAgICAgICBH ZGsuUmVjdGFuZ2xlIHZpc2libGVfcGFnZSA9IGdldF9hZGp1c3RtZW50X3BhZ2UoaGFkanVzdG1l bnQsIHZhZGp1c3RtZW50KTsKICAgICAgICAgIEdkay5SZWN0YW5nbGUgdmlzaWJsZV9iYW5kID0g R2RrLlJlY3RhbmdsZSgpOwohICAgICAgICAgdmlzaWJsZV9wYWdlLmludGVyc2VjdChzZWxlY3Rp b25fYmFuZCwgdmlzaWJsZV9iYW5kKTsKICAgICAgICAgIAogICAgICAgICAgLy8gcGl4ZWxhdGUg c2VsZWN0aW9uIHJlY3RhbmdsZSBpbnRlcmlvcgogICAgICAgICAgaWYgKHZpc2libGVfYmFuZC53 aWR0aCA+IDEgJiYgdmlzaWJsZV9iYW5kLmhlaWdodCA+IDEpIHsKICAgICAgICAgICAgICAvLyBn ZW5lcmF0ZSBhIHBpeGJ1ZiBvZiB0aGUgc2VsZWN0aW9uIGNvbG9yIHdpdGggYSB0cmFuc3BhcmVu Y3kgdG8gcGFpbnQgb3ZlciB0aGUKICAgICAgICAgICAgICAvLyB2aXNpYmxlIHNlbGVjdGlvbiBh cmVhIC4uLiByZXVzZSBvbGQgcGl4YnVmICh3aGljaCBpcyBzaGFyZWQgYW1vbmcgYWxsIGluc3Rh bmNlcykKLS0tIDE2MDEsMTYxMSAtLS0tCiAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAg CiAgICAgICAgICAvLyBmaW5kIHRoZSB2aXNpYmxlIGludGVyc2VjdGlvbiBvZiB0aGUgdmlld3Bv cnQgYW5kIHRoZSBzZWxlY3Rpb24gYmFuZAogICAgICAgICAgR2RrLlJlY3RhbmdsZSB2aXNpYmxl X3BhZ2UgPSBnZXRfYWRqdXN0bWVudF9wYWdlKGhhZGp1c3RtZW50LCB2YWRqdXN0bWVudCk7CiAg ICAgICAgICBHZGsuUmVjdGFuZ2xlIHZpc2libGVfYmFuZCA9IEdkay5SZWN0YW5nbGUoKTsKISAg ICAgICAgIHZpc2libGVfcGFnZS5pbnRlcnNlY3Qoc2VsZWN0aW9uX2JhbmQsIG91dCB2aXNpYmxl X2JhbmQpOwogICAgICAgICAgCiAgICAgICAgICAvLyBwaXhlbGF0ZSBzZWxlY3Rpb24gcmVjdGFu Z2xlIGludGVyaW9yCiAgICAgICAgICBpZiAodmlzaWJsZV9iYW5kLndpZHRoID4gMSAmJiB2aXNp YmxlX2JhbmQuaGVpZ2h0ID4gMSkgewogICAgICAgICAgICAgIC8vIGdlbmVyYXRlIGEgcGl4YnVm IG9mIHRoZSBzZWxlY3Rpb24gY29sb3Igd2l0aCBhIHRyYW5zcGFyZW5jeSB0byBwYWludCBvdmVy IHRoZQogICAgICAgICAgICAgIC8vIHZpc2libGUgc2VsZWN0aW9uIGFyZWEgLi4uIHJldXNlIG9s ZCBwaXhidWYgKHdoaWNoIGlzIHNoYXJlZCBhbW9uZyBhbGwgaW5zdGFuY2VzKQo= ------==--bound.10207.web140.yandex.ru--